[Fedora-directory-commits] console build.properties, 1.4, 1.5 build.xml, 1.6, 1.7
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Tue Oct 25 17:30:48 UTC 2005
Author: rmeggins
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6653
Modified Files:
build.properties build.xml
Log Message:
Bug(s) fixed: 171722
Bug Description: console: build.xml has hardcoded reference to root
directory
Reviewed by: nkinder at redhat.com nhosoi at redhat.com (Thanks!)
Fix Description: Use "." instead of ".." as the console.root. This
allows us to use console.root/buildnum.pl instead of
console.root/console/buildnum.pl. The imports and built dirs are
referenced by console.root/../built e.g. The problem is that when
building from a source tar ball in rpm or gar, it expects the source
directory when unpacked to be the same name as the .tar.gz file e.g.
fedora-console-7.1.1.tar.gz unpacks into fedora-console-7.1.1. If
"/console/" is hard coded, this won't work.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties 15 Sep 2005 22:06:32 -0000 1.4
+++ build.properties 25 Oct 2005 17:30:46 -0000 1.5
@@ -21,7 +21,7 @@
lang=en
-console.root=..
+console.root=.
console.version=71
console.dotversion=7.1
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 29 Sep 2005 17:18:23 -0000 1.6
+++ build.xml 25 Oct 2005 17:30:46 -0000 1.7
@@ -24,7 +24,7 @@
<property file="build.properties"/>
<!-- Paths -->
- <property name="built.dir" value="${console.root}/built"/>
+ <property name="built.dir" value="${console.root}/../built"/>
<property name="package.dir" value="${built.dir}/package"/>
<property name="lib.dir" value="${package.dir}/lib"/>
<property name="dist.dir" value="${package.dir}/java"/>
@@ -32,7 +32,7 @@
<property name="jars.dir" value="${dist.dir}/jars"/>
<property name="built.classdir" value="${built.dir}/classes"/>
<property name="javadoc.dir" value="${built.dir}/doc"/>
- <property name="imports.dir" value="${console.root}/imports"/>
+ <property name="imports.dir" value="${console.root}/../imports"/>
<property name="java.src.dir" value="src"/>
<!-- Prepare -->
@@ -70,12 +70,12 @@
</path>
<!-- Generate version property file -->
- <exec executable="${console.root}/console/buildnum.pl" vmlauncher="true">
+ <exec executable="${console.root}/buildnum.pl" vmlauncher="true">
<arg line="-p ${built.dir}"/>
</exec>
- <exec executable="${console.root}/console/src/com/netscape/management/client/console/genverinfo.sh">
- <arg value="${console.root}/console/src/com/netscape/management/client/console/versioninfo.properties"/>
+ <exec executable="${console.root}/src/com/netscape/management/client/console/genverinfo.sh">
+ <arg value="${console.root}/src/com/netscape/management/client/console/versioninfo.properties"/>
<arg value="${console.dotversion}"/>
<arg value="${built.dir}/buildnum.dat"/>
</exec>
@@ -284,7 +284,7 @@
<target name="clean">
<delete dir="${built.dir}"/>
- <delete file="${console.root}/console/src/com/netscape/management/client/console/versioninfo.properties"/>
+ <delete file="${console.root}/src/com/netscape/management/client/console/versioninfo.properties"/>
</target>
<target name="clean_imports">
More information about the Fedora-directory-commits
mailing list