Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork: [797] trunk/installer
|
From: <tic...@us...> - 2007-09-07 09:38:35
|
Revision: 797
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=797&view=rev
Author: ticheler
Date: 2007-09-07 02:38:36 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
Improved installer build file.
Removed some targets.
Removed the need to copy the full project to the installer/.build directory, speeding up the build process.
Made sure the properties file is updated when compiling.
Version and release numbers are <maintained> in this build file now!! And still stored in the server.prop file.
Modified Paths:
--------------
trunk/installer/build.xml
trunk/installer/installer-config.xml
Modified: trunk/installer/build.xml
===================================================================
--- trunk/installer/build.xml 2007-09-07 07:34:22 UTC (rev 796)
+++ trunk/installer/build.xml 2007-09-07 09:38:36 UTC (rev 797)
@@ -12,14 +12,13 @@
<!-- =================================================================================== -->
- <property file="../web/geonetwork/WEB-INF/server.prop"/>
- <condition property="os" value="macosx">
+ <condition property="osys" value="macosx">
<os family="mac"/>
</condition>
- <condition property="os" value="win">
+ <condition property="osys" value="win">
<os family="windows"/>
</condition>
- <condition property="os" value="unix">
+ <condition property="osys" value="unix">
<os family="unix"/>
</condition>
@@ -31,49 +30,36 @@
<taskdef name="launch4j"
classname="net.sf.launch4j.ant.Launch4jTask"
- classpath="launch4j/${os}/launch4j.jar:launch4j/${os}/lib/xstream.jar"/>
+ classpath="launch4j/${osys}/launch4j.jar:launch4j/${osys}/lib/xstream.jar"/>
<!-- =================================================================================== -->
<target name="setProperties">
+ <!-- Update the properties file -->
<propertyfile
file="../web/geonetwork/WEB-INF/server.prop"
comment="GeoNetwork opensource properties.
These are also used by both gast and geonetwork at runtime">
- <!-- ### these are used by both gast and geonetwork at runtime -->
- <!-- Don't remove !! -->
+ <!-- These are used by both gast and geonetwork at runtime -->
+ <!-- Do not remove !! -->
<entry key="version" value="2.1.0"/>
<entry key="subVersion" value="RC2"/>
-
<entry key="release" value="2.1.0"/>
- <entry key="OS" value="Compiled on ${os.name}"/>
+
<entry key="date" type="date" value="now" pattern="yymmddHHmm"/>
+ <entry key="OS" value="Compiled on ${os.name} (${osys})"/>
</propertyfile>
</target>
-
- <!-- =================================================================================== -->
- <target name="all">
- <ant dir=".." target="javadoc" />
- <ant dir="." target="installer" />
- <ant dir="." target="wininstall" />
- </target>
-
<!-- =================================================================================== -->
<target name="installer" depends="setProperties">
- <ant dir=".." target="compile" />
+ <property file="../web/geonetwork/WEB-INF/server.prop"/>
- <delete dir =".build" />
- <mkdir dir =".build" />
+ <ant dir=".." target="all" />
- <!-- file copying -->
- <copy todir=".build">
- <fileset dir=".."/>
- </copy>
-
<delete dir="../geonetwork-${release}"/>
<mkdir dir="../geonetwork-${release}"/>
@@ -81,6 +67,8 @@
output="../geonetwork-${release}/geonetwork-install.jar"
installerType="standard"
basedir="${basedir}"/>
+
+ <ant dir="." target="wininstall" />
</target>
@@ -88,6 +76,11 @@
<target name="wininstall">
<!-- create a Windows installer using launch4j -->
+
+ <property file="../web/geonetwork/WEB-INF/server.prop"/>
+
+ <echo message="Building Windows installer on ${osys} using launch4j"/>
+
<launch4j configFile="${basedir}/launch4j/launch4jConfig.xml"
jar="../geonetwork-${release}/geonetwork-install.jar"
outfile="../geonetwork-${release}/geonetwork-install.exe"
@@ -95,13 +88,7 @@
txtProductVersion="${version}-${subVersion}"
fileVersion="${version}.0"
productVersion="${version}.0"/>
- </target>
- <!-- =================================================================================== -->
-
- <target name="clean">
- <delete dir =".build" />
- <delete dir="../geonetwork-${release}"/>
</target>
<!-- =================================================================================== -->
Modified: trunk/installer/installer-config.xml
===================================================================
--- trunk/installer/installer-config.xml 2007-09-07 07:34:22 UTC (rev 796)
+++ trunk/installer/installer-config.xml 2007-09-07 09:38:36 UTC (rev 797)
@@ -15,7 +15,7 @@
<author name="OSGeo" email="geo...@os..."/>
</authors>
<url>http://geonetwork-opensource.org/</url>
- <javaversion>1.5</javaversion>
+ <javaversion>1.5.0</javaversion>
</info>
<!-- =================================================================================== -->
@@ -37,8 +37,8 @@
<!-- =================================================================================== -->
<resources>
- <res id="HTMLLicencePanel.licence" src=".build/docs/license.html"/>
- <res id="HTMLInfoPanel.info" src=".build/docs/readme.html"/>
+ <res id="HTMLLicencePanel.licence" src="../docs/license.html"/>
+ <res id="HTMLInfoPanel.info" src="../docs/readme.html"/>
<res id="Installer.image" src="installer.png"/>
<res id="shortcutSpec.xml" src="windows-shortcuts.xml"/>
<res id="Unix_shortcutSpec.xml" src="unix-shortcuts.xml"/>
@@ -70,23 +70,23 @@
This is the Spatial Data Catalog web application.
</description>
- <fileset dir=".build/docs" targetdir="$INSTALL_PATH/docs">
+ <fileset dir="../docs" targetdir="$INSTALL_PATH/docs">
<exclude name="javadoc-gn/**"/>
<exclude name="javadoc-im/**"/>
</fileset>
- <fileset dir=".build/bin" targetdir="$INSTALL_PATH/bin"/>
+ <fileset dir="../bin" targetdir="$INSTALL_PATH/bin"/>
- <fileset dir=".build/gast" targetdir="$INSTALL_PATH/gast">
+ <fileset dir="../gast" targetdir="$INSTALL_PATH/gast">
<exclude name="log/gast.log*"/>
</fileset>
- <fileset dir=".build/jetty" targetdir="$INSTALL_PATH/jetty">
+ <fileset dir="../jetty" targetdir="$INSTALL_PATH/jetty">
<exclude name="log/*.log"/>
<exclude name="log/archive/*.log"/>
</fileset>
- <fileset dir=".build/web" targetdir="$INSTALL_PATH/web">
+ <fileset dir="../web" targetdir="$INSTALL_PATH/web">
<exclude name="geonetwork/images/logos/*"/>
<exclude name="geonetwork/WEB-INF/db/account.prop"/>
<exclude name="geonetwork/WEB-INF/db/data/*"/>
@@ -117,7 +117,7 @@
This is a separate test application that can be used to test the CSW 2.0.1 services.
</description>
- <fileset dir=".build/csw" targetdir="$INSTALL_PATH/csw"/>
+ <fileset dir="../csw" targetdir="$INSTALL_PATH/csw"/>
</pack>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -125,8 +125,8 @@
<pack name="Source code" required="no" preselected="no">
<description>The GeoNetwork source code and the ant build script.</description>
- <fileset dir=".build/src" targetdir="$INSTALL_PATH/src"/>
- <file src=".build/build.xml" targetdir="$INSTALL_PATH"/>
+ <fileset dir="../src" targetdir="$INSTALL_PATH/src"/>
+ <file src="../build.xml" targetdir="$INSTALL_PATH"/>
</pack>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -135,7 +135,7 @@
<description>The installer data files. Installing this package you will
be able to create the installer.</description>
- <fileset dir=".build/installer" targetdir="$INSTALL_PATH/installer">
+ <fileset dir="../installer" targetdir="$INSTALL_PATH/installer">
<exclude name="**/.build"/>
</fileset>
</pack>
@@ -145,8 +145,8 @@
<pack name="Java source code JavaDoc" required="no" preselected="no">
<description>The GeoNetwork JavaDoc source code documentation.</description>
- <fileset dir=".build/docs/javadoc-gn" targetdir="$INSTALL_PATH/docs/javadoc-gn"/>
- <fileset dir=".build/docs/javadoc-im" targetdir="$INSTALL_PATH/docs/javadoc-im"/>
+ <fileset dir="../docs/javadoc-gn" targetdir="$INSTALL_PATH/docs/javadoc-gn"/>
+ <fileset dir="../docs/javadoc-im" targetdir="$INSTALL_PATH/docs/javadoc-im"/>
</pack>
</packs>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|