Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork: [862] trunk/installer
|
From: <tic...@us...> - 2007-09-19 16:18:26
|
Revision: 862
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=862&view=rev
Author: ticheler
Date: 2007-09-19 09:18:29 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
Small updates
Modified Paths:
--------------
trunk/installer/build.xml
trunk/installer/installer-config-win-jre.xml
trunk/installer/installer-config.xml
Modified: trunk/installer/build.xml
===================================================================
--- trunk/installer/build.xml 2007-09-19 14:44:35 UTC (rev 861)
+++ trunk/installer/build.xml 2007-09-19 16:18:29 UTC (rev 862)
@@ -43,7 +43,7 @@
<!-- These are used by both gast and geonetwork at runtime -->
<!-- Do not remove !! -->
<entry key="version" value="2.1.0"/>
- <entry key="subVersion" value="Final"/>
+ <entry key="subVersion" value="RC2"/>
<entry key="release" value="2.1.0"/>
<entry key="date" type="date" value="now" pattern="yymmddHHmm"/>
@@ -64,7 +64,7 @@
<mkdir dir="../geonetwork-${release}"/>
<izpack input="${basedir}/installer-config.xml"
- output="../geonetwork-${release}/geonetwork-install.jar"
+ output="../geonetwork-${release}/geonetwork-install-${release}.jar"
installerType="standard"
basedir="${basedir}"/>
@@ -82,8 +82,8 @@
<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"
+ jar="../geonetwork-${release}/geonetwork-install-${release}.jar"
+ outfile="../geonetwork-${release}/geonetwork-install-${release}.exe"
txtFileVersion="${version}-${subVersion}-${date}"
txtProductVersion="${version}-${subVersion}"
fileVersion="${version}.0"
@@ -101,13 +101,13 @@
<echo message="Building Windows installer with JRE on ${osys} using launch4j"/>
<izpack input="${basedir}/installer-config-win-jre.xml"
- output="../geonetwork-${release}/geonetwork-install-win-jre.jar"
+ output="../geonetwork-${release}/geonetwork-install-win-jre-${release}.jar"
installerType="standard"
basedir="${basedir}"/>
<launch4j configFile="${basedir}/launch4j/launch4jConfig-jre.xml"
- jar="../geonetwork-${release}/geonetwork-install-win-jre.jar"
- outfile="../geonetwork-${release}/geonetwork-install-with-jre.exe"
+ jar="../geonetwork-${release}/geonetwork-install-win-jre-${release}.jar"
+ outfile="../geonetwork-${release}/geonetwork-install-with-jre-${release}.exe"
txtFileVersion="${version}-${subVersion}-${date}"
txtProductVersion="${version}-${subVersion}"
fileVersion="${version}.0"
Modified: trunk/installer/installer-config-win-jre.xml
===================================================================
--- trunk/installer/installer-config-win-jre.xml 2007-09-19 14:44:35 UTC (rev 861)
+++ trunk/installer/installer-config-win-jre.xml 2007-09-19 16:18:29 UTC (rev 862)
@@ -6,7 +6,7 @@
<info>
<appname>geonetwork</appname>
- <appversion>2.1.0</appversion>
+ <appversion>2.1.0 RC2</appversion>
<authors>
<author name="FAO GeoNetwork Team" email="Geo...@fa..."/>
<author name="VAM WFP" email="va...@wf..."/>
@@ -73,11 +73,12 @@
<fileset dir="../docs" targetdir="$INSTALL_PATH/docs">
<exclude name="javadoc-gn/**"/>
<exclude name="javadoc-im/**"/>
+ <exclude name="lyx/**"/>
+ <exclude name="developers/**"/>
</fileset>
<fileset dir="../bin" targetdir="$INSTALL_PATH/bin">
- <exclude name="jre"/>
- <exclude name="*.bat"/>
+ <exclude name="jre/**"/>
<exclude name="jetty.xml_with_geoserver"/>
</fileset>
@@ -106,7 +107,7 @@
<exclude name="geonetwork/WEB-INF/removed"/>
<exclude name="intermap/log/*"/>
<exclude name="intermap/WEB-INF/mapServers.xml_with_geoserver"/>
- <exclude name="geoserver"/>
+ <exclude name="geoserver/**"/>
</fileset>
<executable targetfile="$INSTALL_PATH/bin/start-geonetwork.sh" />
@@ -129,9 +130,16 @@
to the Geospatial Web. This embedded version is setup to provide the base layers
for the map viewers in GeoNetwork. You can safely install this on modern computers,
but be careful on older computers with little memory (less then 256MB RAM).
+To have a full resolution background layer, check the GeoNetwork site for
+instructions and download.
</description>
- <fileset dir="../web/geoserver" targetdir="$INSTALL_PATH/web/geoserver"/>
+ <fileset dir="../web/geoserver" targetdir="$INSTALL_PATH/web/geoserver">
+ <exclude name="data/catalog.xml_jpg"/>
+ <exclude name="data/coverages/BlueMarble_world/world-topo-bathy-200407-3x8640x4320.jpg"/>
+ <exclude name="data/coverages/BlueMarble_world/world-topo-bathy-200407-3x8640x4320.wld"/>
+ <exclude name="data/coverages/BlueMarble_world/info.xml_jpg"/>
+ </fileset>
<singlefile target="$INSTALL_PATH/web/intermap/WEB-INF/mapServers.xml"
src="../web/intermap/WEB-INF/mapServers.xml_with_geoserver" override="true"/>
<singlefile target="$INSTALL_PATH/bin/jetty.xml"
Modified: trunk/installer/installer-config.xml
===================================================================
--- trunk/installer/installer-config.xml 2007-09-19 14:44:35 UTC (rev 861)
+++ trunk/installer/installer-config.xml 2007-09-19 16:18:29 UTC (rev 862)
@@ -6,7 +6,7 @@
<info>
<appname>geonetwork</appname>
- <appversion>2.1.0</appversion>
+ <appversion>2.1.0 RC2</appversion>
<authors>
<author name="FAO GeoNetwork Team" email="Geo...@fa..."/>
<author name="VAM WFP" email="va...@wf..."/>
@@ -73,9 +73,12 @@
<fileset dir="../docs" targetdir="$INSTALL_PATH/docs">
<exclude name="javadoc-gn/**"/>
<exclude name="javadoc-im/**"/>
+ <exclude name="lyx/**"/>
+ <exclude name="developers/**"/>
</fileset>
<fileset dir="../bin" targetdir="$INSTALL_PATH/bin">
+ <exclude name="jre/**"/>
<exclude name="jetty.xml_with_geoserver"/>
</fileset>
@@ -98,7 +101,7 @@
<exclude name="geonetwork/WEB-INF/removed"/>
<exclude name="intermap/log/*"/>
<exclude name="intermap/WEB-INF/mapServers.xml_with_geoserver"/>
- <exclude name="geoserver"/>
+ <exclude name="geoserver/**"/>
</fileset>
<executable targetfile="$INSTALL_PATH/bin/start-geonetwork.sh" />
@@ -121,9 +124,16 @@
to the Geospatial Web. This embedded version is setup to provide the base layers
for the map viewers in GeoNetwork. You can safely install this on modern computers,
but be careful on older computers with little memory (less then 256MB RAM).
+To have a full resolution background layer, check the GeoNetwork site for
+instructions and download.
</description>
- <fileset dir="../web/geoserver" targetdir="$INSTALL_PATH/web/geoserver"/>
+ <fileset dir="../web/geoserver" targetdir="$INSTALL_PATH/web/geoserver">
+ <exclude name="data/catalog.xml_jpg"/>
+ <exclude name="data/coverages/BlueMarble_world/world-topo-bathy-200407-3x8640x4320.jpg"/>
+ <exclude name="data/coverages/BlueMarble_world/world-topo-bathy-200407-3x8640x4320.wld"/>
+ <exclude name="data/coverages/BlueMarble_world/info.xml_jpg"/>
+ </fileset>
<singlefile target="$INSTALL_PATH/web/intermap/WEB-INF/mapServers.xml"
src="../web/intermap/WEB-INF/mapServers.xml_with_geoserver" override="true"/>
<singlefile target="$INSTALL_PATH/bin/jetty.xml"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|