Attachment 212561 Details for Bug 314071 – updated patch

[patch] updated patch

fds-console-brand2.diff (text/plain), 5.24 KB, created by jmccann on 2007-10-01 18:00:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jmccann

Created: 2007-10-01 18:00:47 UTC

Size: 5.24 KB

patch

obsolete

>Index: build.properties
>===================================================================
>RCS file: /cvs/dirsec/console/build.properties,v
>retrieving revision 1.14
>diff -p -u -8 -r1.14 build.properties
>--- build.properties	1 Aug 2007 21:29:55 -0000	1.14
>+++ build.properties	1 Oct 2007 17:59:37 -0000
>@@ -17,16 +17,17 @@
> # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> # END COPYRIGHT BLOCK
> #
> # Properties to control the build
> 
> lang=en
> 
> console.root=.
>+console.brand=idm
> console.version=11
> console.dotversion=1.1.0
> console.dotgenversion=1.1
> 
> mcc.core=idm-console-mcc
> mcc.name=${mcc.core}-${console.dotversion}
> mcc.gen.name=${mcc.core}-${console.dotgenversion}
> 
>Index: build.xml
>===================================================================
>RCS file: /cvs/dirsec/console/build.xml,v
>retrieving revision 1.17
>diff -p -u -8 -r1.17 build.xml
>--- build.xml	1 Aug 2007 21:29:55 -0000	1.17
>+++ build.xml	1 Oct 2007 17:59:37 -0000
>@@ -24,16 +24,17 @@ END COPYRIGHT BLOCK
>   <property file="build.properties"/>
> 
>   
>   <property name="built.dir"        value="${console.root}/../built"/>
>   <property name="built.classdir"   value="${built.dir}/classes"/>
>   <property name="release.dir"      value="${built.dir}/release"/>
>   <property name="built.jardir"     value="${release.dir}/jars"/>
>   <property name="package.dir"      value="${release.dir}/package"/>
>+  <property name="srcdist.dir"      value="${release.dir}/srcdist"/>
>   <property name="dist.dir"         value="${release.dir}/dist"/>
>   <property name="lib.dir"          value="${package.dir}/lib"/>
>   <property name="java.dir"         value="${package.dir}/java"/>
>   <property name="javadoc.dir"      value="${built.dir}/doc"/>
>   <property name="imports.dir"      value="${console.root}/../imports"/>
>   <property name="java.src.dir"     value="src"/>
>   <property environment="env"/>
> 
>@@ -301,31 +302,63 @@ END COPYRIGHT BLOCK
>       </fileset>
>     </copy>
> 
>     
>     <copy file="startconsole-sandbox" tofile="${package.dir}/startconsole"/>
>     <chmod file="${package.dir}/startconsole" perm="755"/>
> 
>     
>-    <tar destfile="${dist.dir}/${console.brand}-console-${console.dotversion}.tar.gz"
>+    <tar destfile="${dist.dir}/${console.brand}-console-framework-${console.dotversion}.tar.gz"
>          compression="gzip">
>       <tarfileset dir="${package.dir}"
>-                  prefix="${console.brand}-console-${console.dotversion}"
>+                  prefix="${console.brand}-console-framework-${console.dotversion}"
>                   mode="755">
>         <include name="startconsole"/>
>       </tarfileset>
>       <tarfileset dir="${package.dir}"
>-                  prefix="${console.brand}-console-${console.dotversion}">
>+                  prefix="${console.brand}-console-framework-${console.dotversion}">
>         <include name="**"/>
>         <exclude name="startconsole"/>
>       </tarfileset>
>     </tar>
>   </target>
>- 
>+
>+  
>+  <target name="srcdist" depends="clean,prepare_package" description="Creates the source distribution">
>+    <copy todir="${srcdist.dir}">
>+      <fileset dir=".">
>+         <include name="build.properties" />
>+         <include name="build.xml" />
>+         <include name="buildnum.pl" />
>+         <include name="LICENSE" />
>+         <include name="startconsole-sandbox" />
>+         <include name="idm-console-framework.spec" />
>+         <include name="imports.*" />
>+         <include name="examples/**" />
>+         <include name="src/**" />
>+         <include name="test/**" />
>+         <exclude name="**/CVS/**" />
>+      </fileset>
>+    </copy>
>+
>+    
>+    <tar destfile="${dist.dir}/${console.brand}-console-framework-${console.dotversion}-src.tar.gz"
>+         compression="gzip">
>+      <tarfileset dir="${srcdist.dir}"
>+                  prefix="${console.brand}-console-framework-${console.dotversion}"
>+                  mode="755">
>+        <include name="**" />
>+      </tarfileset>
>+    </tar>
>+  </target>
>+
>+  
>+  <target name="dist" depends="srcdist,package" />
>+
>   
>   <target name="javadoc" depends="prepare_doc">
>     <javadoc 
>       packagenames="com.netscape.management.*"
>       sourcepath="src"
>       destdir="${javadoc.dir}"
>       author="true"
>       version="true"
>Index: idm-console-framework.spec
>===================================================================
>RCS file: /cvs/dirsec/console/idm-console-framework.spec,v
>retrieving revision 1.1
>diff -p -u -8 -r1.1 idm-console-framework.spec
>--- idm-console-framework.spec	1 Aug 2007 21:29:55 -0000	1.1
>+++ idm-console-framework.spec	1 Oct 2007 17:59:37 -0000
>@@ -7,17 +7,17 @@ Release: 1
> Summary: Identity Management Console Framework
> 
> Group: System Environment/Libraries
> License: LGPL
> URL: http://directory.fedoraproject.org
> 
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildArch: noarch
>-Source: %{name}-%{version}.tar.bz2
>+Source: %{name}-%{version}-src.tar.bz2
> Requires: ldapjdk
> Requires: jss >= 4.2
> BuildRequires: ant >= 1.6.2
> BuildRequires: ldapjdk
> BuildRequires: jss >=  4.2 
> 
> %description
> A Java Management Console framework used for remote server management.

Actions: View | Diff

Attachments on bug 314071: 212411 | 212561