Attachment 160459 Details for Bug 250481 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 5.62 KB, created by Nathan Kinder on 2007-08-01 20:29:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-08-01 20:29:54 UTC

Size: 5.62 KB

patch

obsolete

>cvs diff: fedora-idm-console was removed, no comparison available
>cvs diff: fedora-idm-console.spec was removed, no comparison available
>cvs diff: idm-console-framework.spec is a new entry, no comparison available
>cvs diff: src/com/netscape/management/client/theme/theme.properties was removed, no comparison available
>cvs diff: src/com/netscape/management/client/theme/images/ConsoleBanner.gif was removed, no comparison available
>cvs diff: src/com/netscape/management/client/theme/images/login.gif was removed, no comparison available
>cvs diff: src/com/netscape/management/client/theme/images/logo16.gif was removed, no comparison available
>cvs diff: src/com/netscape/management/client/theme/images/logo32.gif was removed, no comparison available
>Index: build.properties
>===================================================================
>RCS file: /cvs/dirsec/console/build.properties,v
>retrieving revision 1.13
>diff -u -5 -t -r1.13 build.properties
>--- build.properties	27 Jul 2007 20:29:59 -0000	1.13
>+++ build.properties	1 Aug 2007 18:40:32 -0000
>@@ -19,30 +19,24 @@
> #
> # Properties to control the build
> 
> lang=en
> 
>-console.brand=fedora
>-
> console.root=.
> console.version=11
> console.dotversion=1.1.0
> console.dotgenversion=1.1
> 
>-mcc.core=${console.brand}-mcc
>+mcc.core=idm-console-mcc
> mcc.name=${mcc.core}-${console.dotversion}
> mcc.gen.name=${mcc.core}-${console.dotgenversion}
> 
>-nmclf.core=${console.brand}-nmclf
>+nmclf.core=idm-console-nmclf
> nmclf.name=${nmclf.core}-${console.dotversion}
> nmclf.gen.name=${nmclf.core}-${console.dotgenversion}
> 
>-base.core=${console.brand}-idm-console-base
>+base.core=idm-console-base
> base.name=${base.core}-${console.dotversion}
> base.gen.name=${base.core}-${console.dotgenversion}
> 
>-theme.core=${console.brand}-idm-console
>-theme.name=${theme.core}-${console.dotversion}
>-theme.gen.name=${theme.core}-${console.dotgenversion}
>-
> jss.jar.name=jss4.jar
> ldapjdk.jar.name=ldapjdk.jar
>Index: build.xml
>===================================================================
>RCS file: /cvs/dirsec/console/build.xml,v
>retrieving revision 1.16
>diff -u -5 -t -r1.16 build.xml
>--- build.xml	27 Jul 2007 20:29:59 -0000	1.16
>+++ build.xml	1 Aug 2007 18:40:32 -0000
>@@ -181,26 +181,10 @@
>              verbose="no"
>              fork="true"
>              excludes="**/CVS/**">
>              <classpath refid="console.classpath" />
>     </javac>
>-
>-    
>-    <copy file="fedora-idm-console" todir="${release.dir}"/>
>-    <replace file="${release.dir}/fedora-idm-console">
>-      <replacefilter token="@classdest@" value="${classdest}"/>
>-      <replacefilter token="@jssjar@" value="${jss.local.location}/${jss.jar.name}"/> 
>-      <replacefilter token="@ldapjdkjar@" value="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
>-      <replacefilter token="@basejar@" value="${base.name}.jar"/>
>-      <replacefilter token="@mccjar@" value="${mcc.name}.jar"/>
>-      <replacefilter token="@mcclangjar@" value="${mcc.name}_${lang}.jar"/>
>-      <replacefilter token="@nmclfjar@" value="${nmclf.name}.jar"/>
>-      <replacefilter token="@nmclflangjar@" value="${nmclf.name}_${lang}.jar"/>
>-      <replacefilter token="@themejar@" value="${theme.name}_${lang}.jar"/>
>-      <replacefilter token="@prefsdir@" value="${theme.core}"/>
>-      <replacefilter token="@libdir@" value="${lib.dir}"/>
>-    </replace>
>   </target>
> 
>   
>   <target name="build_jars" depends="build,prepare_jars">
>     
>@@ -230,16 +214,10 @@
>     <jar jarfile="${built.jardir}/${mcc.name}_${lang}.jar" >
>       <fileset dir="${java.src.dir}">
>          <include name="com/netscape/management/client/**/*.properties" />
>          <include name="com/netscape/management/client/**/*.gif" />
>          <include name="com/netscape/management/client/**/*.jpg" />
>-         <exclude name="com/netscape/management/client/theme/**" />
>-      </fileset>
>-    </jar>
>-    <jar jarfile="${built.jardir}/${theme.name}_${lang}.jar" >
>-      <fileset dir="${java.src.dir}">
>-         <include name="com/netscape/management/client/theme/**" />
>       </fileset>
>     </jar>
>     <jar jarfile="${built.jardir}/${nmclf.name}.jar" >
>       <fileset dir="${built.classdir}">
>          <include name="com/netscape/management/nmclf/**/*.class" />
>@@ -278,11 +256,10 @@
>   
>   <target name="package" depends="build_jars,prepare_package,import_jss_lib,import_nss_lib,import_nspr_lib">
>     
>     <copy file="${built.jardir}/${mcc.name}.jar" todir="${java.dir}"/>
>     <copy file="${built.jardir}/${mcc.name}_${lang}.jar" todir="${java.dir}"/>
>-    <copy file="${built.jardir}/${theme.name}_${lang}.jar" todir="${java.dir}"/>
>     <copy file="${built.jardir}/${nmclf.name}.jar" todir="${java.dir}"/>
>     <copy file="${built.jardir}/${nmclf.name}_${lang}.jar" todir="${java.dir}"/>
>     <copy file="${built.jardir}/${base.name}.jar" todir="${java.dir}"/>
>     
>     <exec executable="ln" dir="${java.dir}" vmlauncher="true">
>@@ -290,13 +267,10 @@
>     </exec>
>     <exec executable="ln" dir="${java.dir}" vmlauncher="true">
>       <arg line="-s ${mcc.name}_${lang}.jar ${mcc.gen.name}_${lang}.jar"/>
>     </exec>
>     <exec executable="ln" dir="${java.dir}" vmlauncher="true">
>-      <arg line="-s ${theme.name}_${lang}.jar ${theme.gen.name}_${lang}.jar"/>
>-    </exec>
>-    <exec executable="ln" dir="${java.dir}" vmlauncher="true">
>       <arg line="-s ${nmclf.name}.jar ${nmclf.gen.name}.jar"/>
>     </exec>
>     <exec executable="ln" dir="${java.dir}" vmlauncher="true">
>       <arg line="-s ${nmclf.name}_${lang}.jar ${nmclf.gen.name}_${lang}.jar"/>
>     </exec>

Actions: View | Diff

Attachments on bug 250481: 160459 | 160468