Changeset 17898
- Timestamp:
- 2008-11-20T16:33:21+13:00 (15 years ago)
- Location:
- release-kits
- Files:
-
- 27 edited
-
lirk2/ant-scripts/build.xml (modified) (1 diff)
-
lirk2/ant-scripts/compile.xml (modified) (7 diffs)
-
lirk2/ant-scripts/create-distribution.xml (modified) (4 diffs)
-
lirk3/ant-scripts/build.xml (modified) (1 diff)
-
lirk3/ant-scripts/compile.xml (modified) (8 diffs)
-
lirk3/ant-scripts/create-components.xml (modified) (7 diffs)
-
lirk3/ant-scripts/create-distribution.xml (modified) (2 diffs)
-
lirk3/ant-scripts/create-installer.xml (modified) (1 diff)
-
mark2/ant-scripts/build.xml (modified) (1 diff)
-
mark2/ant-scripts/compile.xml (modified) (4 diffs)
-
mark2/ant-scripts/create-distribution.xml (modified) (3 diffs)
-
mark3/ant-scripts/build.xml (modified) (1 diff)
-
mark3/ant-scripts/compile.xml (modified) (4 diffs)
-
mark3/ant-scripts/create-components.xml (modified) (7 diffs)
-
mark3/ant-scripts/create-distribution.xml (modified) (2 diffs)
-
mark3/ant-scripts/create-installer.xml (modified) (1 diff)
-
shared/ant-scripts/init.xml (modified) (5 diffs)
-
shared/greenstone2/ant-scripts/rk2-targets.xml (modified) (2 diffs)
-
shared/greenstone3/ant-scripts/rk3-targets.xml (modified) (2 diffs)
-
wirk2/ant-scripts/build.xml (modified) (1 diff)
-
wirk2/ant-scripts/compile.xml (modified) (3 diffs)
-
wirk2/ant-scripts/create-distribution.xml (modified) (3 diffs)
-
wirk3/ant-scripts/build.xml (modified) (1 diff)
-
wirk3/ant-scripts/compile.xml (modified) (4 diffs)
-
wirk3/ant-scripts/create-components.xml (modified) (7 diffs)
-
wirk3/ant-scripts/create-distribution.xml (modified) (5 diffs)
-
wirk3/ant-scripts/create-installer.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
release-kits/lirk2/ant-scripts/build.xml
r17597 r17898 13 13 14 14 <!-- for the benefit of the shared scripts, set release-kit home --> 15 <property name="rk.name" value="lirk2"/> 15 16 <property name="rk.home" value="${lirk2.home}" /> 16 17 <property name="rk.os" value="linux" /> -
release-kits/lirk2/ant-scripts/compile.xml
r17519 r17898 6 6 <!-- checkout --> 7 7 <antcall target="checkout-gsdl-gli" /> 8 <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 8 9 9 10 <!-- configure --> … … 29 30 <target name="checkout-gsdl-gli"> 30 31 <svn> 31 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/ gsdl"/>32 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/ gsdl/gli"/>32 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/> 33 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/> 33 34 </svn> 34 35 </target> … … 36 37 <target name="add-static-to-configure-in"> 37 38 <rsr 38 file="${basedir}/ gsdl/configure.in"39 file="${basedir}/compiled/configure.in" 39 40 pattern="^LDFLAGS=.*$" 40 41 replacement="LDFLAGS=-static" /> 41 <exec dir="${basedir}/ gsdl" executable="autoconf" output="${basedir}/gsdl/configure"><arg value="configure.in"/></exec>42 <exec dir="${basedir}/compiled" executable="autoconf" output="${basedir}/compiled/configure"><arg value="configure.in"/></exec> 42 43 </target> 43 44 44 45 <target name="set-environment-in-packages-configure"> 45 46 <rsr 46 file="${basedir}/ gsdl/common-src/packages/configure"47 file="${basedir}/compiled/common-src/packages/configure" 47 48 pattern="^ENVIRONMENT=.*$" 48 49 replacement="ENVIRONMENT="LDFLAGS=-static"" /> 49 50 <rsr 50 file="${basedir}/ gsdl/build-src/packages/configure"51 file="${basedir}/compiled/build-src/packages/configure" 51 52 pattern="^ENVIRONMENT=.*$" 52 53 replacement="ENVIRONMENT="LDFLAGS=-static"" /> … … 54 55 55 56 <target name="run-configure"> 56 <exec dir="${basedir}/ gsdl" executable="${basedir}/gsdl/configure">57 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure"> 57 58 <env key="LDFLAGS" value="-static"/> 58 59 </exec> … … 61 62 <target name="makefiles-add-static"> 62 63 <rsr 63 file="${basedir}/ gsdl/build-src/packages/wv/wv-gs/Makefile"64 file="${basedir}/compiled/build-src/packages/wv/wv-gs/Makefile" 64 65 pattern="^LDFLAGS =.*$" 65 66 replacement="LDFLAGS = -static" /> 66 67 <rsr 67 file="${basedir}/ gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile"68 file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" 68 69 pattern="^LDFLAGS =.*$" 69 70 replacement="LDFLAGS = -static" /> 70 71 <rsr 71 file="${basedir}/ gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile"72 file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" 72 73 pattern="^LDFLAGS =.*$" 73 74 replacement="LDFLAGS = -static" /> 74 75 <rsr 75 file="${basedir}/ gsdl/build-src/packages/rtftohtml/rtftohtml_src/Makefile"76 file="${basedir}/compiled/build-src/packages/rtftohtml/rtftohtml_src/Makefile" 76 77 pattern="(-o rtftohtml.{2}EXEEXT.{1})" 77 78 replacement="$1 -static" /> … … 79 80 80 81 <target name="run-make"> 81 <exec dir="${basedir}/ gsdl" executable="make"/>82 <exec dir="${basedir}/compiled" executable="make"/> 82 83 </target> 83 84 84 85 85 86 <target name="run-make-install"> 86 <exec dir="${basedir}/ gsdl" executable="make"><arg value="install"/></exec>87 <exec dir="${basedir}/compiled" executable="make"><arg value="install"/></exec> 87 88 </target> 88 89 89 90 <target name="copy-library-oai"> 90 <exec executable="mv"><arg line="${basedir}/ gsdl/cgi-bin/library ${basedir}/gsdl/bin/linux/library"/></exec>91 <exec executable="mv"><arg line="${basedir}/ gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec>91 <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/linux/library"/></exec> 92 <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/linux/oaiserver"/></exec> 92 93 </target> 93 94 94 95 <target name="strip-execs"> 95 <exec dir="${basedir}/ gsdl/bin/linux" executable="find">96 <exec dir="${basedir}/compiled/bin/linux" executable="find"> 96 97 <arg line="! -name . -type f -maxdepth 1 -exec strip {} ;"/> 97 98 </exec> … … 99 100 100 101 <target name="build-demo-collection"> 101 <exec dir="${basedir}/ gsdl" executable="${lirk2.home}/resources/build-demo.sh"/>102 <exec dir="${basedir}/compiled" executable="${lirk2.home}/resources/build-demo.sh"/> 102 103 </target> 103 104 -
release-kits/lirk2/ant-scripts/create-distribution.xml
r17835 r17898 5 5 6 6 <antcall target="export-gsdl-gli" /> 7 <antcall target=" dist-set-version" />7 <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall> 8 8 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 9 9 <antcall target="drop-in-docs" /> … … 30 30 <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 31 31 </svn> 32 </target>33 34 <target name="dist-set-version">35 <echo level="info">Setting version in src/lib/gsdlconf.h</echo>36 <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version}"" />37 38 <echo level="info">Setting version in Install.sh</echo>39 <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo "Version: ).*(" .*)" replacement="$1${version}$2" />40 41 <echo level="info">Setting version in etc/VERSION</echo>42 <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />43 32 </target> 44 33 … … 88 77 <echo level="info">Dropping compiled binaries into distribution</echo> 89 78 <delete dir="distributions/web/bin/linux" /> 90 <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec>91 <exec dir="${basedir}" executable="cp"><arg line=" gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>92 <exec dir="${basedir}" executable="cp"><arg line=" gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>79 <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/linux distributions/web/bin"/></exec> 80 <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec> 81 <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 93 82 </target> 94 83 … … 96 85 <echo level="info">Dropping rebuilt demo collection into distribution</echo> 97 86 <delete dir="distributions/web/collect/demo" /> 98 <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>87 <exec dir="${basedir}" executable="cp"><arg line="-r compiled/collect/demo distributions/web/collect"/></exec> 99 88 </target> 100 89 -
release-kits/lirk3/ant-scripts/build.xml
r17596 r17898 13 13 14 14 <!-- for the benefit of the shared scripts, set release-kit home --> 15 <property name="rk.name" value="lirk3"/> 15 16 <property name="rk.home" value="${lirk3.home}" /> 16 17 <property name="rk.os" value="linux" /> -
release-kits/lirk3/ant-scripts/compile.xml
r17523 r17898 9 9 <!-- preparation --> 10 10 <antcall target="greenstone3-set-version-numbers"> 11 <param name="greenstone3basedir" value="${basedir}/ greenstone3"/>11 <param name="greenstone3basedir" value="${basedir}/compiled"/> 12 12 </antcall> 13 <ant dir=" greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix" inheritAll="false"/>13 <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix" inheritAll="false"/> 14 14 15 15 <antcall target="tweak-configure-scripts" /> 16 16 17 17 <!-- update --> 18 <ant dir=" greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix" inheritAll="false"/>18 <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix" inheritAll="false"/> 19 19 20 20 <!-- configure --> 21 21 <antcall target="regenerate-configure"/> 22 <ant dir=" greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>22 <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/> 23 23 <antcall target="tweak-makefiles" /> 24 24 25 25 <!-- build --> 26 <ant dir=" greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>26 <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/> 27 27 <antcall target="linux-strip-execs" /> 28 28 … … 37 37 <target name="checkout-greenstone3"> 38 38 <svn> 39 <checkout url="${svn.root}/greenstone3/${branch.path}" destPath=" greenstone3"/>39 <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/> 40 40 </svn> 41 41 </target> … … 48 48 49 49 <target name="regenerate-configure"> 50 <exec dir=" greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure">50 <exec dir="compiled/gs2build" executable="autoconf" output="compiled/gs2build/configure"> 51 51 <arg line="configure.in"/> 52 52 </exec> 53 <chmod file=" greenstone3/gs2build/configure" perm="+x"/>53 <chmod file="compiled/gs2build/configure" perm="+x"/> 54 54 </target> 55 55 … … 63 63 64 64 <target name="linux-strip-execs"> 65 <exec dir=" greenstone3/gs2build/bin/linux" executable="find">65 <exec dir="compiled/gs2build/bin/linux" executable="find"> 66 66 <arg line="! -name . -exec strip {} ;"/> 67 67 </exec> … … 69 69 70 70 <target name="prepare-documentation"> 71 <mkdir dir=" greenstone3/gsdl-manuals"/>71 <mkdir dir="compiled/gsdl-manuals"/> 72 72 <svn> 73 <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath=" greenstone3/gsdl-manuals/manuals"/>74 <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath=" greenstone3/gsdl-manuals/shared"/>73 <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/> 74 <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/> 75 75 </svn> 76 <javac srcdir=" greenstone3/gsdl-manuals/shared"77 destdir=" greenstone3/gsdl-manuals/shared"76 <javac srcdir="compiled/gsdl-manuals/shared" 77 destdir="compiled/gsdl-manuals/shared" 78 78 debug="on"> 79 79 <include name="*.java"/> 80 80 </javac> 81 <unzip src=" greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>81 <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/> 82 82 83 83 <path id="documentation.compile.classpath"> 84 <fileset dir=" greenstone3/gsdl-manuals">84 <fileset dir="compiled/gsdl-manuals"> 85 85 <include name="**/*.jar"/> 86 86 </fileset> 87 <pathelement path=" greenstone3/gsdl-manuals/shared"/>88 <pathelement path=" greenstone3/gsdl-manuals/manuals"/>87 <pathelement path="compiled/gsdl-manuals/shared"/> 88 <pathelement path="compiled/gsdl-manuals/manuals"/> 89 89 </path> 90 90 91 <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output=" greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml">92 <arg value=" greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />93 <arg value=" greenstone3/gli/help/en/help.xml" />94 <arg value=" greenstone3" />91 <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml"> 92 <arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 93 <arg value="compiled/gli/help/en/help.xml" /> 94 <arg value="compiled" /> 95 95 </java> 96 96 97 <chmod perm="a+x" file=" greenstone3/gsdl-manuals/shared/fop/fop.sh"/>97 <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/> 98 98 <echo>Run generate-pdf.sh</echo> 99 <exec dir=" greenstone3/gsdl-manuals/manuals" executable="/bin/sh">99 <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh"> 100 100 <arg line="generate-pdf.sh u en" /> 101 101 </exec> … … 109 109 110 110 <target name="mgpp-add-static"> 111 <rsr file=" greenstone3/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />112 <exec dir=" greenstone3/gs2build/common-src/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mgpp/configure">111 <rsr file="compiled/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" /> 112 <exec dir="compiled/gs2build/common-src/indexers/mgpp" executable="autoconf" output="compiled/gs2build/common-src/indexers/mgpp/configure"> 113 113 <arg line="configure.in"/> 114 114 </exec> … … 116 116 117 117 <target name="mg-add-static"> 118 <rsr file=" greenstone3/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />119 <exec dir=" greenstone3/gs2build/common-src/indexers/mg" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mg/configure">118 <rsr file="compiled/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" /> 119 <exec dir="compiled/gs2build/common-src/indexers/mg" executable="autoconf" output="compiled/gs2build/common-src/indexers/mg/configure"> 120 120 <arg line="configure.in"/> 121 121 </exec> … … 123 123 124 124 <target name="gs2build-add-static"> 125 <rsr file=" greenstone3/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=""$" replacement="ENVIRONMENT="LDFLAGS=-static"" />126 <rsr file=" greenstone3/gs2build/build-src/packages/configure" pattern="^ENVIRONMENT=""$" replacement="ENVIRONMENT="LDFLAGS=-static"" />127 <rsr file=" greenstone3/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />125 <rsr file="compiled/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=""$" replacement="ENVIRONMENT="LDFLAGS=-static"" /> 126 <rsr file="compiled/gs2build/build-src/packages/configure" pattern="^ENVIRONMENT=""$" replacement="ENVIRONMENT="LDFLAGS=-static"" /> 127 <rsr file="compiled/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" /> 128 128 </target> 129 129 130 130 <target name="wv-add-static"> 131 <rsr file=" greenstone3/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />131 <rsr file="compiled/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" /> 132 132 </target> 133 133 134 134 <target name="xlhtml-add-static"> 135 <rsr file=" greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />135 <rsr file="compiled/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" /> 136 136 </target> 137 137 138 138 <target name="ppthtml-add-static"> 139 <rsr file=" greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />139 <rsr file="compiled/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" /> 140 140 </target> 141 141 142 142 <target name="rtftohtml-add-static"> 143 <rsr file=" greenstone3/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />143 <rsr file="compiled/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" /> 144 144 </target> 145 145 146 146 <target name="gdbm-add-static"> 147 <rsr file=" greenstone3/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" />147 <rsr file="compiled/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" /> 148 148 </target> 149 149 -
release-kits/lirk3/ant-scripts/create-components.xml
r17814 r17898 2 2 <project name="lirk3-create-components" default="create-components"> 3 3 4 <!-- create components from the distribution folder -->4 <!-- create components from the distributions folder --> 5 5 6 6 <!-- 1st level --> … … 42 42 43 43 <copy todir="components/tmp/core" overwrite="true"> 44 <fileset dir="distribution /greenstone3">44 <fileset dir="distributions/web"> 45 45 <include name="**/*"/> 46 46 … … 58 58 <exclude name="packages/tomcat"/> 59 59 <exclude name="packages/tomcat/**/*"/> 60 <exclude name="distributions/ greenstone3/gs2build/bin/linux/imagemagick"/>61 <exclude name="distributions/ greenstone3/gs2build/bin/linux/imagemagick/**/*"/>60 <exclude name="distributions/web/gs2build/bin/linux/imagemagick"/> 61 <exclude name="distributions/web/gs2build/bin/linux/imagemagick/**/*"/> 62 62 63 63 </fileset> … … 78 78 79 79 <copy todir="components/tmp/sourcecode" overwrite="true"> 80 <fileset dir="distribution /greenstone3">80 <fileset dir="distributions/web"> 81 81 <include name="src/**/*"/> 82 82 <include name="gs2build/common-src/**/*"/> … … 100 100 101 101 <copy todir="components/tmp/ant" overwrite="true"> 102 <fileset dir="distribution /greenstone3/packages">102 <fileset dir="distributions/web/packages"> 103 103 <include name="ant/**/*"/> 104 104 </fileset> … … 119 119 120 120 <copy todir="components/tmp/tomcat" overwrite="true"> 121 <fileset dir="distribution /greenstone3/packages">121 <fileset dir="distributions/web/packages"> 122 122 <include name="tomcat/**/*"/> 123 123 </fileset> … … 138 138 139 139 <copy todir="components/tmp/imagemagick" overwrite="true"> 140 <fileset dir="distribution /greenstone3/gs2build/bin/linux">140 <fileset dir="distributions/web/gs2build/bin/linux"> 141 141 <include name="imagemagick/**/*"/> 142 142 </fileset> -
release-kits/lirk3/ant-scripts/create-distribution.xml
r17816 r17898 6 6 <!-- create distribution --> 7 7 <antcall target="export-greenstone3-gli" /> 8 <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution /greenstone3"/></antcall>9 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution /greenstone3/gli"/></antcall>8 <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web"/></antcall> 9 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 10 10 <antcall target="insert-user-manual"/> 11 11 <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets --> 12 12 13 <antcall target="copy-web-to-source -greenstone3" /> <!-- from gs3-targets-->13 <antcall target="copy-web-to-source" /> <!-- from init --> 14 14 15 <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution /greenstone3" target="create-distribution-1" inheritAll="false">15 <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-1" inheritAll="false"> 16 16 <property name="app.version" value="${version}"/> 17 17 <property name="branch.path" value="${branch.path}"/> 18 18 </ant> 19 <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution /greenstone3" target="create-distribution-2" inheritAll="false">19 <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-2" inheritAll="false"> 20 20 <property name="app.version" value="${version}"/> 21 21 <property name="branch.path" value="${branch.path}"/> 22 22 </ant> 23 <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution /greenstone3" target="create-distribution-3" inheritAll="false">23 <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-3" inheritAll="false"> 24 24 <property name="app.version" value="${version}"/> 25 25 <property name="branch.path" value="${branch.path}"/> … … 29 29 <antcall target="export-imagemagick-linux-binaries" /> 30 30 31 <antcall target="strip-svn-dirs"><param name="dir" value="distribution "/></antcall> <!-- from init -->31 <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init --> 32 32 33 33 </target> 34 34 35 35 <target name="export-greenstone3-gli"> 36 <mkdir dir="distribution "/>37 <delete dir="distribution /greenstone3"/>36 <mkdir dir="distributions"/> 37 <delete dir="distributions/web"/> 38 38 <svn> 39 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution /greenstone3"/>40 <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution /greenstone3/gli"/>39 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/> 40 <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 41 41 </svn> 42 42 </target> 43 43 44 44 <target name="export-imagemagick-linux-binaries"> 45 <delete dir="distribution /greenstone3/gs2build/bin/linux/imagemagick"/>45 <delete dir="distributions/web/gs2build/bin/linux/imagemagick"/> 46 46 <svn> 47 <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distribution /greenstone3/gs2build/bin/linux/imagemagick"/>47 <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distributions/web/gs2build/bin/linux/imagemagick"/> 48 48 </svn> 49 49 </target> 50 50 51 51 <target name="copy-over-build-xml"> 52 <move file="distribution /greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>52 <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/> 53 53 </target> 54 54 55 55 <target name="insert-user-manual"> 56 <copy file=" greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>56 <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/> 57 57 </target> 58 58 59 59 <target name="insert-compiled-binaries"> 60 <delete dir="distribution /greenstone3/lib/jni"/>61 <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>60 <delete dir="distributions/web/lib/jni"/> 61 <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec> 62 62 63 <delete dir="distribution /greenstone3/gs2build/bin/linux"/>64 <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>63 <delete dir="distributions/web/gs2build/bin/linux"/> 64 <exec executable="cp"><arg line="-r compiled/gs2build/bin/linux distributions/web/gs2build/bin"/></exec> 65 65 66 <delete dir="distribution /greenstone3/gs2build/bin/java"/>67 <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>66 <delete dir="distributions/web/gs2build/bin/java"/> 67 <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec> 68 68 69 <exec executable="cp"><arg line=" greenstone3/bin/search4j distribution/greenstone3/bin"/></exec>69 <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec> 70 70 71 71 </target> -
release-kits/lirk3/ant-scripts/create-installer.xml
r17697 r17898 13 13 14 14 <copy todir="${basedir}/installer/classes" overwrite="true"> 15 <fileset file="${basedir}/distribution /greenstone3/LICENSE.txt"/>15 <fileset file="${basedir}/distributions/web/LICENSE.txt"/> 16 16 </copy> 17 17 -
release-kits/mark2/ant-scripts/build.xml
r17597 r17898 16 16 17 17 <!-- for the benefit of the shared scripts, set release-kit home --> 18 <property name="rk.name" value="mark2"/> 18 19 <property name="rk.home" value="${mark2.home}" /> 19 20 <property name="rk.os" value="linux" /> 21 <!-- os.suffix set dynamically below --> 20 22 21 23 <!-- IMPORT OTHER ANT SCRIPTS --> -
release-kits/mark2/ant-scripts/compile.xml
r17523 r17898 6 6 <!-- checkout --> 7 7 <antcall target="checkout-gsdl-gli" /> 8 <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 8 9 9 10 <!-- configure --> … … 27 28 <target name="checkout-gsdl-gli"> 28 29 <svn javahl="false"> 29 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/ gsdl"/>30 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/ gsdl/gli"/>30 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/> 31 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/> 31 32 </svn> 32 33 </target> 33 34 34 35 <target name="run-configure"> 35 <exec dir="${basedir}/ gsdl" executable="${basedir}/gsdl/configure">36 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure"> 36 37 <arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/> 37 38 </exec> … … 39 40 40 41 <target name="tweak-makefiles"> 41 <rsr file="${basedir}/ gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />42 <rsr file="${basedir}/ gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />43 <rsr file="${basedir}/ gsdl/common-src/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />44 <rsr file="${basedir}/ gsdl/common-src/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />45 <rsr file="${basedir}/ gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />46 <rsr file="${basedir}/ gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />42 <rsr file="${basedir}/compiled/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 43 <rsr file="${basedir}/compiled/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 44 <rsr file="${basedir}/compiled/common-src/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 45 <rsr file="${basedir}/compiled/common-src/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 46 <rsr file="${basedir}/compiled/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 47 <rsr file="${basedir}/compiled/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 47 48 </target> 48 49 49 50 <target name="run-make"> 50 <exec dir="${basedir}/ gsdl" executable="make"/>51 <exec dir="${basedir}/compiled" executable="make"/> 51 52 </target> 52 53 53 54 <target name="run-make-install"> 54 <exec dir="${basedir}/ gsdl" executable="make"><arg value="install"/></exec>55 <exec dir="${basedir}/compiled" executable="make"><arg value="install"/></exec> 55 56 </target> 56 57 57 58 <target name="copy-library-oai"> 58 <exec executable="mv"><arg line="${basedir}/ gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec>59 <exec executable="mv"><arg line="${basedir}/ gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec>59 <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/darwin/library"/></exec> 60 <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/darwin/oaiserver"/></exec> 60 61 </target> 61 62 62 63 <target name="strip-execs"> 63 <exec dir="${basedir}/ gsdl/bin/darwin" executable="find">64 <exec dir="${basedir}/compiled/bin/darwin" executable="find"> 64 65 <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} ;"/> 65 66 </exec> … … 67 68 68 69 <target name="build-demo-collection"> 69 <exec dir="${basedir}/ gsdl" executable="${mark2.home}/resources/build-demo.sh"/>70 <exec dir="${basedir}/compiled" executable="${mark2.home}/resources/build-demo.sh"/> 70 71 </target> 71 72 -
release-kits/mark2/ant-scripts/create-distribution.xml
r17835 r17898 5 5 6 6 <antcall target="export-gsdl-gli" /> 7 <antcall target=" dist-set-version" />7 <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall> 8 8 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 9 9 <antcall target="drop-in-docs" /> … … 47 47 </target> 48 48 49 <target name="dist-set-version">50 <echo level="info">Setting version in common-src/src/lib/gsdlconf.h</echo>51 <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version}"" />52 53 <echo level="info">Setting version in Install.sh</echo>54 <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo "Version: ).*(" .*)" replacement="$1${version}$2" />55 56 <echo level="info">Setting version in etc/VERSION</echo>57 <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />58 </target>59 60 <target name="dist-set-gli-version">61 62 </target>63 64 49 <target name="drop-in-binaries"> 65 50 <echo level="info">Dropping compiled binaries into distribution</echo> 66 51 <delete dir="distributions/web/bin/linux" /> 67 52 <delete dir="distributions/web/bin/darwin" /> 68 <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/darwin distributions/web/bin"/></exec>69 <exec dir="${basedir}" executable="cp"><arg line=" gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>70 <exec dir="${basedir}" executable="cp"><arg line=" gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>53 <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/darwin distributions/web/bin"/></exec> 54 <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec> 55 <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 71 56 </target> 72 57 … … 74 59 <echo level="info">Dropping rebuilt demo collection into distribution</echo> 75 60 <delete dir="distributions/web/collect/demo" /> 76 <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>61 <exec dir="${basedir}" executable="cp"><arg line="-r compiled/collect/demo distributions/web/collect"/></exec> 77 62 </target> 78 63 -
release-kits/mark3/ant-scripts/build.xml
r17597 r17898 16 16 17 17 <!-- for the benefit of the shared scripts, set release-kit home --> 18 <property name="rk.name" value="mark3"/> 18 19 <property name="rk.home" value="${mark3.home}" /> 19 20 <property name="rk.os" value="linux" /> 21 <!-- os.suffix set dynamically below --> 20 22 21 23 <!-- IMPORT OTHER ANT SCRIPTS --> -
release-kits/mark3/ant-scripts/compile.xml
r17523 r17898 9 9 <!-- preparation --> 10 10 <antcall target="greenstone3-set-version-numbers"> 11 <param name="greenstone3basedir" value="${basedir}/ greenstone3"/>11 <param name="greenstone3basedir" value="${basedir}/compiled"/> 12 12 </antcall> 13 13 <antcall target="set-gdbm-installed-path" /> 14 <ant target="prepare-unix" dir=" greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>14 <ant target="prepare-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 15 15 16 16 <!-- update --> 17 <ant target="update-unix" dir=" greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>17 <ant target="update-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 18 18 19 19 <!-- configure --> 20 <ant target="configure-unix" dir=" greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>20 <ant target="configure-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 21 21 <antcall target="tweak-makefiles" /> 22 22 23 23 <!-- build --> 24 <ant target="build-unix" dir=" greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>24 <ant target="build-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 25 25 <antcall target="linux-strip-execs" /> 26 26 … … 35 35 <target name="checkout-greenstone3"> 36 36 <svn javahl="false"> 37 <checkout url="${svn.root}/greenstone3/${branch.path}" destPath=" greenstone3"/>37 <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/> 38 38 </svn> 39 39 </target> 40 40 41 41 <target name="set-version-number-property"> 42 <rsr file=" greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />42 <rsr file="compiled/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" /> 43 43 </target> 44 44 45 45 <target name="set-gdbm-installed-path"> 46 <rsr file=" greenstone3/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/>46 <rsr file="compiled/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/> 47 47 </target> 48 48 49 49 <target name="tweak-makefiles"> 50 50 <rsr 51 file="${basedir}/ greenstone3/gs2build/common-src/src/gdbmedit/db2txt/Makefile"51 file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/db2txt/Makefile" 52 52 pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" 53 53 replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 54 54 55 55 <rsr 56 file="${basedir}/ greenstone3/gs2build/common-src/src/gdbmedit/txt2db/Makefile"56 file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/txt2db/Makefile" 57 57 pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" 58 58 replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 59 59 60 60 <rsr 61 file="${basedir}/ greenstone3/src/packages/javagdbm/jni/Makefile"61 file="${basedir}/compiled/src/packages/javagdbm/jni/Makefile" 62 62 pattern="^(GDBM_LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" 63 63 replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> … … 65 65 66 66 <target name="linux-strip-execs"> 67 <exec dir=" greenstone3/gs2build/bin/darwin" executable="find">67 <exec dir="compiled/gs2build/bin/darwin" executable="find"> 68 68 <arg line=". ! -name . -exec strip {} ;"/> 69 69 </exec> … … 71 71 72 72 <target name="prepare-documentation"> 73 <mkdir dir=" greenstone3/gsdl-manuals"/>73 <mkdir dir="compiled/gsdl-manuals"/> 74 74 <svn javahl="false"> 75 <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath=" greenstone3/gsdl-manuals/manuals"/>76 <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath=" greenstone3/gsdl-manuals/shared"/>75 <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/> 76 <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/> 77 77 </svn> 78 <javac srcdir=" greenstone3/gsdl-manuals/shared"79 destdir=" greenstone3/gsdl-manuals/shared"78 <javac srcdir="compiled/gsdl-manuals/shared" 79 destdir="compiled/gsdl-manuals/shared" 80 80 debug="on"> 81 81 <include name="*.java"/> 82 82 </javac> 83 <unzip src=" greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>83 <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/> 84 84 85 85 <path id="documentation.compile.classpath"> 86 <fileset dir=" greenstone3/gsdl-manuals">86 <fileset dir="compiled/gsdl-manuals"> 87 87 <include name="**/*.jar"/> 88 88 </fileset> 89 <pathelement path=" greenstone3/gsdl-manuals/shared"/>90 <pathelement path=" greenstone3/gsdl-manuals/manuals"/>89 <pathelement path="compiled/gsdl-manuals/shared"/> 90 <pathelement path="compiled/gsdl-manuals/manuals"/> 91 91 </path> 92 92 93 <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output=" greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml">94 <arg value=" greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />95 <arg value=" greenstone3/gli/help/en/help.xml" />96 <arg value=" greenstone3" />93 <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml"> 94 <arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 95 <arg value="compiled/gli/help/en/help.xml" /> 96 <arg value="compiled" /> 97 97 </java> 98 98 99 <chmod perm="a+x" file=" greenstone3/gsdl-manuals/shared/fop/fop.sh"/>99 <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/> 100 100 <echo>Run generate-pdf.sh</echo> 101 <exec dir=" greenstone3/gsdl-manuals/manuals" executable="/bin/sh">101 <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh"> 102 102 <arg line="generate-pdf.sh u en" /> 103 103 </exec> -
release-kits/mark3/ant-scripts/create-components.xml
r17814 r17898 2 2 <project name="mark3-create-components" default="create-components"> 3 3 4 <!-- create components from the distribution folder -->4 <!-- create components from the distributions folder --> 5 5 6 6 <!-- 1st level --> … … 43 43 44 44 <copy todir="components/tmp/core" overwrite="true"> 45 <fileset dir="distribution /greenstone3">45 <fileset dir="distributions/web"> 46 46 <include name="**/*"/> 47 47 … … 85 85 86 86 <copy todir="components/tmp/sourcecode" overwrite="true"> 87 <fileset dir="distribution /greenstone3">87 <fileset dir="distributions/web"> 88 88 <include name="src/**/*"/> 89 89 <include name="gs2build/common-src/**/*"/> … … 108 108 109 109 <copy todir="components/tmp/ant" overwrite="true"> 110 <fileset dir="distribution /greenstone3/packages">110 <fileset dir="distributions/web/packages"> 111 111 <include name="ant/**/*"/> 112 112 </fileset> … … 127 127 128 128 <copy todir="components/tmp/tomcat" overwrite="true"> 129 <fileset dir="distribution /greenstone3/packages">129 <fileset dir="distributions/web/packages"> 130 130 <include name="tomcat/**/*"/> 131 131 </fileset> … … 146 146 147 147 <copy todir="components/tmp/imagemagick" overwrite="true"> 148 <fileset dir="distribution /greenstone3/gs2build/bin/darwin">148 <fileset dir="distributions/web/gs2build/bin/darwin"> 149 149 <include name="imagemagick/**/*"/> 150 150 </fileset> … … 165 165 166 166 <copy todir="components/tmp/ghostscript" overwrite="true"> 167 <fileset dir="distribution /greenstone3/gs2build/bin/darwin">167 <fileset dir="distributions/web/gs2build/bin/darwin"> 168 168 <include name="ghostscript/**/*"/> 169 169 </fileset> -
release-kits/mark3/ant-scripts/create-distribution.xml
r17833 r17898 6 6 <!-- create distribution --> 7 7 <antcall target="export-greenstone3-gli" /> 8 <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution /greenstone3"/></antcall>9 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution /greenstone3/gli"/></antcall>8 <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web"/></antcall> 9 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 10 10 <antcall target="insert-user-manual"/> 11 11 <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets --> 12 12 13 <antcall target="copy-web-to-source -greenstone3" /> <!-- from gs3-targets-->13 <antcall target="copy-web-to-source" /> <!-- from init --> 14 14 15 <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution /greenstone3" inheritAll="false">15 <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 16 16 <property name="app.version" value="${version}"/> 17 17 <property name="branch.path" value="${branch.path}"/> 18 18 </ant> 19 19 20 <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution /greenstone3" inheritAll="false">20 <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 21 21 <property name="app.version" value="${version}"/> 22 22 <property name="branch.path" value="${branch.path}"/> 23 23 </ant> 24 24 25 <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution /greenstone3" inheritAll="false">25 <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 26 26 <property name="app.version" value="${version}"/> 27 27 <property name="branch.path" value="${branch.path}"/> … … 32 32 <antcall target="export-imagemagick-darwin-binaries" /> 33 33 <antcall target="export-ghostscript-darwin-binaries" /> 34 <antcall target="strip-svn-dirs"><param name="dir" value="distribution "/></antcall> <!-- from init -->34 <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init --> 35 35 </target> 36 36 37 37 <target name="export-greenstone3-gli"> 38 <mkdir dir="distribution "/>39 <delete dir="distribution /greenstone3"/>38 <mkdir dir="distributions"/> 39 <delete dir="distributions/web"/> 40 40 <svn javahl="false"> 41 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution /greenstone3"/>42 <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution /greenstone3/gli"/>41 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/> 42 <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 43 43 </svn> 44 44 </target> 45 45 46 46 <target name="export-imagemagick-darwin-binaries"> 47 <delete dir="distribution /greenstone3/gs2build/bin/darwin/imagemagick"/>47 <delete dir="distributions/web/gs2build/bin/darwin/imagemagick"/> 48 48 <svn> 49 <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distribution /greenstone3/gs2build/bin/darwin/imagemagick"/>49 <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distributions/web/gs2build/bin/darwin/imagemagick"/> 50 50 </svn> 51 51 </target> 52 52 53 53 <target name="export-ghostscript-darwin-binaries"> 54 <delete dir="distribution /greenstone3/gs2build/bin/darwin/ghostscript"/>54 <delete dir="distributions/web/gs2build/bin/darwin/ghostscript"/> 55 55 <svn> 56 <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distribution /greenstone3/gs2build/bin/darwin/ghostscript"/>56 <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distributions/web/gs2build/bin/darwin/ghostscript"/> 57 57 </svn> 58 58 </target> 59 59 60 <target name="dist-set-version-number-property">61 <rsr62 file="distribution/greenstone3/resources/java/global.properties.in"63 pattern="(.*)@gsdl3version@(.*)"64 replacement="$1${version}$2" />65 </target>66 67 60 <target name="copy-over-build-xml"> 68 <move file="distribution /greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>61 <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/> 69 62 </target> 70 63 71 64 <target name="insert-user-manual"> 72 <copy file=" greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>65 <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/> 73 66 </target> 74 67 75 68 <target name="insert-compiled-binaries"> 76 <delete dir="distribution /greenstone3/lib/jni"/>77 <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>69 <delete dir="distributions/web/lib/jni"/> 70 <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec> 78 71 79 <delete dir="distribution /greenstone3/gs2build/bin/darwin"/>80 <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/darwin distribution/greenstone3/gs2build/bin"/></exec>72 <delete dir="distributions/web/gs2build/bin/darwin"/> 73 <exec executable="cp"><arg line="-r compiled/gs2build/bin/darwin distributions/web/gs2build/bin"/></exec> 81 74 82 <delete dir="distribution /greenstone3/gs2build/bin/java"/>83 <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>84 <exec executable="cp"><arg line=" greenstone3/bin/search4j distribution/greenstone3/bin"/></exec>75 <delete dir="distributions/web/gs2build/bin/java"/> 76 <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec> 77 <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec> 85 78 </target> 86 79 87 <target name="rename-build-xml-for-transit">88 <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>89 </target>90 91 92 80 </project> -
release-kits/mark3/ant-scripts/create-installer.xml
r17697 r17898 13 13 14 14 <copy todir="${basedir}/installer/classes" overwrite="true"> 15 <fileset file="${basedir}/distribution /greenstone3/LICENSE.txt" />15 <fileset file="${basedir}/distributions/web/LICENSE.txt" /> 16 16 </copy> 17 17 -
release-kits/shared/ant-scripts/init.xml
r17881 r17898 3 3 4 4 <!-- load in static properties from build.properties --> 5 <property file=" build.properties" />5 <property file="${rk.name}-build.properties" /> 6 6 7 7 <!-- CONSTANTS (overridable in build.properties) --> … … 52 52 53 53 <!-- our classes --> 54 <fileset dir="${rk.home}/ant-scripts/tasks"> 55 <include name="**/*.jar"/> 56 </fileset> 57 58 <!-- jars in lib directory --> 59 <fileset dir="${rk.home}/lib"> 60 <include name="*.jar"/> 61 </fileset> 62 63 <!-- a few ant-installer jars --> 64 <fileset dir="${rk.home}/packages/ant-installer/lib"> 65 <include name="ant-installer-ext.jar"/> 66 <include name="ant-installer.jar"/> 54 <fileset dir="${rk.home}"> 55 <include name="ant-scripts/tasks/antelope/AntelopeTasks_3.4.2.jar"/> 56 <include name="ant-scripts/tasks/orangevolt/roxes-win32forjava-1.1.1.jar"/> 57 <include name="ant-scripts/tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar"/> 58 <include name="ant-scripts/tasks/svnant/lib/ganymed.jar"/> 59 <include name="ant-scripts/tasks/svnant/lib/svnClientAdapter.jar"/> 60 <include name="ant-scripts/tasks/svnant/lib/svnant.jar"/> 61 <include name="ant-scripts/tasks/svnant/lib/svnjavahl.jar"/> 62 <include name="ant-scripts/tasks/svnant/lib/svnkit.jar"/> 63 <include name="ant-scripts/tasks/greenstone/anttasks.jar"/> 64 <include name="ant-scripts/tasks/7z-ant/7z.jar"/> 65 <include name="lib/crypt.jar"/> 66 <include name="lib/serializer.jar"/> 67 <include name="lib/xalan.jar"/> 68 <include name="lib/xercesImpl.jar"/> 69 <include name="lib/xml-apis.jar"/> 70 <include name="packages/ant-installer/lib/ant-installer-ext.jar"/> 71 <include name="packages/ant-installer/lib/ant-installer.jar"/> 67 72 </fileset> 68 73 … … 118 123 <not><isset property="version"/></not> 119 124 </bool> 120 <fail>Version number not set</fail> 125 <fail>Version number not set. 126 Check that the file '${rk.name}-build.properties' exists and defines property 'version'.</fail> 121 127 </if> 122 128 <property name="app.version" value="${version}"/> … … 224 230 </target> 225 231 232 <!-- fork the web distribution to preserve a source release --> 226 233 <target name="copy-web-to-source"> 227 234 <copy todir="distributions/source"><fileset dir="distributions/web"/></copy> … … 415 422 </target> 416 423 424 <!-- shared target to compile the uninstaller --> 425 <target name="compile-uninstaller"> 426 <echo>Compiling Uninstaller</echo> 427 428 <!-- create working build directory --> 429 <mkdir dir="${basedir}/compiled/uninstaller/build/resources" /> 430 431 <!-- copile to build --> 432 <javac 433 srcdir="${rk.home}/uninstaller" 434 destdir="${basedir}/compiled/uninstaller/build" /> 435 436 <!-- copy language bundle into place --> 437 <native2ascii 438 implementation="sun" 439 src="${rk.home}/language-strings" 440 dest="${basedir}/compiled/uninstaller/build/resources"/> 441 442 <!-- jar it all up --> 443 <jar 444 destfile="${basedir}/compiled/uninstaller/uninst.jar" 445 manifest="${rk.home}/uninstaller/manifest.mf" 446 basedir="${basedir}/compiled/uninstaller/build" /> 447 448 </target> 449 450 <!-- copy the uninstaller from the compiled directory to web distribution --> 451 <target name="insert-uninstaller"> 452 <copy file="compiled/uninstaller/uninst.jar" todir="distributions/web" /> 453 <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" /> 454 </target> 455 456 <!-- creates the comp for the source release, works for all release kits --> 457 <target name="prepare-source-release"> 458 <delete dir="components/tmp/source-release"/> 459 <mkdir dir="components/tmp/source-release"/> 460 461 <copy todir="components/tmp/source-release" overwrite="true"> 462 <fileset dir="distributions/source"/> 463 </copy> 464 <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/> 465 </target> 466 417 467 </project> -
release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml
r17810 r17898 12 12 <property name="version.major" value="2"/> 13 13 14 <target name="compile-uninstaller"> 15 <echo>Compiling Uninstaller</echo> 14 <target name="gsdl-set-version-numbers"> 15 <echo level="info">Setting version in src/lib/gsdlconf.h</echo> 16 <rsr file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version}"" /> 16 17 17 < !-- create working build directory -->18 < mkdir dir="${basedir}/gsdl/uninstaller/build/resources" />18 <echo level="info">Setting version in Install.sh</echo> 19 <rsr file="${gsdl.basedir}/Install.sh" pattern="(echo "Version: ).*(" .*)" replacement="$1${version}$2" /> 19 20 20 <!-- copile to build --> 21 <javac 22 srcdir="${rk.home}/uninstaller" 23 destdir="${basedir}/gsdl/uninstaller/build" /> 24 25 <!-- copy language bundle into place --> 26 <native2ascii 27 implementation="sun" 28 src="${rk.home}/language-strings" 29 dest="${basedir}/gsdl/uninstaller/build/resources"/> 30 31 <!-- jar it all up --> 32 <jar 33 destfile="${basedir}/gsdl/uninstaller/uninst.jar" 34 manifest="${rk.home}/uninstaller/manifest.mf" 35 basedir="${basedir}/gsdl/uninstaller/build" /> 36 37 </target> 38 39 <target name="insert-uninstaller"> 40 <copy file="gsdl/uninstaller/uninst.jar" todir="distributions/web" /> 41 <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" /> 21 <echo level="info">Setting version in etc/VERSION</echo> 22 <rsr file="${gsdl.basedir}/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" /> 42 23 </target> 43 24 … … 49 30 </target> 50 31 51 <!-- source-release -->52 <target name="prepare-source-release">53 <delete dir="components/tmp/source-release"/>54 <mkdir dir="components/tmp/source-release"/>55 56 <copy todir="components/tmp/source-release" overwrite="true">57 <fileset dir="distributions/source"/>58 </copy>59 <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false" includes="**/*"/>60 </target>61 62 63 32 </project> -
release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml
r17813 r17898 12 12 <property name="version.major" value="3"/> 13 13 14 <target name="compile-uninstaller">15 <echo>Compiling Uninstaller</echo>16 17 <!-- create working build directory -->18 <mkdir dir="${basedir}/greenstone3/uninstaller/build/resources" />19 20 <!-- copile to build -->21 <javac22 srcdir="${rk.home}/uninstaller"23 destdir="${basedir}/greenstone3/uninstaller/build" />24 25 <!-- copy language bundle into place -->26 <native2ascii27 implementation="sun"28 src="${rk.home}/language-strings"29 dest="${basedir}/greenstone3/uninstaller/build/resources"/>30 31 <!-- jar it all up -->32 <jar33 destfile="${basedir}/greenstone3/uninstaller/uninst.jar"34 manifest="${rk.home}/uninstaller/manifest.mf"35 basedir="${basedir}/greenstone3/uninstaller/build" />36 37 </target>38 39 <target name="insert-uninstaller">40 <copy file="greenstone3/uninstaller/uninst.jar" todir="distribution/greenstone3" />41 <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distribution/greenstone3" />42 </target>43 44 14 <target name="greenstone3-set-version-numbers"> 45 15 <rsr … … 49 19 </target> 50 20 51 <target name="copy-web-to-source-greenstone3">52 <copy todir="distribution/source"><fileset dir="distribution/greenstone3"/></copy>53 </target>54 55 56 <!-- sourcecode-release -->57 <target name="prepare-source-release">58 <delete dir="components/tmp/source-release"/>59 <mkdir dir="components/tmp/source-release"/>60 61 <copy todir="components/tmp/source-release" overwrite="true">62 <fileset dir="distribution/source"/>63 </copy>64 <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/>65 </target>66 67 68 21 </project> -
release-kits/wirk2/ant-scripts/build.xml
r17597 r17898 16 16 17 17 <!-- for the benefit of the shared scripts, set release-kit home --> 18 <property name="rk.name" value="wirk2"/> 18 19 <property name="rk.home" value="${wirk2.home}" /> 19 20 <property name="rk.os" value="windows" /> -
release-kits/wirk2/ant-scripts/compile.xml
r17583 r17898 4 4 <target name="compile"> 5 5 <antcall target="checkout-gsdl-gli" /> 6 <antcall target=" set-version-numbers" />6 <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 7 7 <antcall target="unzip-packages" /> 8 8 <antcall target="get-winbin" /> … … 15 15 <target name="checkout-gsdl-gli"> 16 16 <svn> 17 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/ gsdl"/>18 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/ gsdl/gli"/>17 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/> 18 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/> 19 19 </svn> 20 20 </target> 21 21 22 <target name="set-version-numbers">23 <rsr file="${basedir}/gsdl/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1"${version}"" />24 <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo "Version: ).*(" .*)" replacement="$1${version}$2" />25 <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />26 </target>27 28 22 <target name="unzip-packages"> 29 <unzip src="${basedir}/ gsdl/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/common-src/packages/windows/crypt"/>30 <unzip src="${basedir}/ gsdl/common-src/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/common-src/packages/windows/expat"/>31 <unzip src="${basedir}/ gsdl/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/common-src/packages/windows/gdbm"/>32 <unzip src="${basedir}/ gsdl/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/common-src/packages/windows/stlport"/>33 <unzip src="${basedir}/ gsdl/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/gsdl/common-src/indexers/packages/windows/iconv"/>23 <unzip src="${basedir}/compiled/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/compiled/common-src/packages/windows/crypt"/> 24 <unzip src="${basedir}/compiled/common-src/packages/windows/expat/expat.zip" dest="${basedir}/compiled/common-src/packages/windows/expat"/> 25 <unzip src="${basedir}/compiled/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/compiled/common-src/packages/windows/gdbm"/> 26 <unzip src="${basedir}/compiled/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/compiled/common-src/packages/windows/stlport"/> 27 <unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/> 34 28 </target> 35 29 36 30 <target name="get-winbin"> 37 31 <if> 38 <bool><not><available file="${basedir}/ gsdl/bin/windows"/></not></bool>39 <svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/ gsdl/bin/windows" revision="${branch.revision}"/></svn>32 <bool><not><available file="${basedir}/compiled/bin/windows"/></not></bool> 33 <svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/compiled/bin/windows" revision="${branch.revision}"/></svn> 40 34 </if> 41 35 </target> 42 36 43 37 <target name="insert-perl"> 44 <mkdir dir="${basedir}/ gsdl/bin/windows"/>45 <delete dir="${basedir}/ gsdl/bin/windows/perl"/>46 <unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/ gsdl/bin/windows"/>38 <mkdir dir="${basedir}/compiled/bin/windows"/> 39 <delete dir="${basedir}/compiled/bin/windows/perl"/> 40 <unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/compiled/bin/windows"/> 47 41 </target> 48 42 49 43 <target name="compile-c-code"> 50 <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/ gsdl" overwrite="true"/>51 <exec dir="${basedir}/ gsdl" executable="${basedir}/gsdl/compile.bat" />52 <move file="${basedir}/ gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/>53 <move todir="${basedir}/ gsdl/bin/windows">54 <fileset dir="${basedir}/ gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/>44 <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/compiled" overwrite="true"/> 45 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/compile.bat" /> 46 <move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/> 47 <move todir="${basedir}/compiled/bin/windows"> 48 <fileset dir="${basedir}/compiled/cgi-bin" includes="library.exe,oaiserver.exe"/> 55 49 </move> 56 50 </target> … … 58 52 <target name="build-demo-collection"> 59 53 <!-- the envs on these execs simulate the environment when you run setup.bat --> 60 <exec dir="${basedir}/ gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">54 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe"> 61 55 <arg line="bin\script\import.pl --removeold demo"/> 62 <env key="GSDLHOME" value="${basedir}/ gsdl"/>63 <env key="GSDLCOLLECTDIR" value="${basedir}/ gsdl/collect"/>56 <env key="GSDLHOME" value="${basedir}/compiled"/> 57 <env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/> 64 58 <env key="GSDLOS" value="windows"/> 65 <env key="PATH" value="${basedir}\ gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>59 <env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/> 66 60 </exec> 67 <exec dir="${basedir}/ gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">61 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe"> 68 62 <arg line="bin\script\buildcol.pl --removeold demo"/> 69 <env key="GSDLHOME" value="${basedir}/ gsdl"/>70 <env key="GSDLCOLLECTDIR" value="${basedir}/ gsdl/collect"/>63 <env key="GSDLHOME" value="${basedir}/compiled"/> 64 <env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/> 71 65 <env key="GSDLOS" value="windows"/> 72 <env key="PATH" value="${basedir}\ gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>66 <env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/> 73 67 </exec> 74 68 75 <delete dir="${basedir}/ gsdl/collect/demo/index"/>76 <move file="${basedir}/ gsdl/collect/demo/building" tofile="${basedir}/gsdl/collect/demo/index"/>69 <delete dir="${basedir}/compiled/collect/demo/index"/> 70 <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/> 77 71 </target> 78 72 -
release-kits/wirk2/ant-scripts/create-distribution.xml
r17882 r17898 5 5 6 6 <antcall target="export-gsdl-gli" /> 7 <antcall target=" dist-set-version" />7 <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall> 8 8 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 9 9 <antcall target="drop-in-docs" /> … … 32 32 </target> 33 33 34 <target name="dist-set-version">35 <echo level="info">Setting version in src/lib/gsdlconf.h</echo>36 <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version}"" />37 <echo level="info">Setting version in etc/VERSION</echo>38 <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />39 </target>40 41 34 <target name="drop-in-binaries"> 42 35 <echo level="info">Dropping compiled binaries into distribution</echo> 43 36 <delete dir="${basedir}/distributions/web/bin/windows" /> 44 37 <copy todir="${basedir}/distributions/web/bin/windows"> 45 <fileset dir="${basedir}/ gsdl/bin/windows" includes="**/*"/>38 <fileset dir="${basedir}/compiled/bin/windows" includes="**/*"/> 46 39 </copy> 47 <copy todir="${basedir}/distributions/web" file="${basedir}/ gsdl/bin/windows/server.exe"/>40 <copy todir="${basedir}/distributions/web" file="${basedir}/compiled/bin/windows/server.exe"/> 48 41 49 42 <echo level="info">Dropping LuceneWrapper.jar in place</echo> … … 55 48 <delete dir="${basedir}/distributions/web/collect/demo" /> 56 49 <copy todir="${basedir}/distributions/web/collect/demo"> 57 <fileset dir="${basedir}/ gsdl/collect/demo" includes="**/*"/>50 <fileset dir="${basedir}/compiled/collect/demo" includes="**/*"/> 58 51 </copy> 59 52 </target> -
release-kits/wirk3/ant-scripts/build.xml
r17597 r17898 16 16 17 17 <!-- for the benefit of the shared scripts, set release-kit home --> 18 <property name="rk.name" value="wirk3"/> 18 19 <property name="rk.home" value="${wirk3.home}" /> 19 20 <property name="rk.os" value="windows" /> -
release-kits/wirk3/ant-scripts/compile.xml
r17604 r17898 4 4 <target name="compile"> 5 5 <antcall target="checkout-greenstone3" /> 6 <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/ greenstone3" /></antcall>7 <ant target="prepare-windows" dir=" greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false">6 <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/compiled" /></antcall> 7 <ant target="prepare-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 8 8 <property name="app.version" value="${version}"/> 9 9 <property name="branch.path" value="${branch.path}"/> 10 10 <property name="branch.revision" value="${branch.revision}"/> 11 11 </ant> 12 <ant target="build-windows" dir=" greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false">12 <ant target="build-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 13 13 <property name="app.version" value="${version}"/> 14 14 <property name="branch.path" value="${branch.path}"/> … … 21 21 <target name="checkout-greenstone3"> 22 22 <svn> 23 <checkout url="${svn.root}/greenstone3/${branch.path}" destPath=" greenstone3" revision="${branch.revision}"/>23 <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled" revision="${branch.revision}"/> 24 24 </svn> 25 25 </target> … … 32 32 33 33 <target name="prepare-documentation"> 34 <mkdir dir=" greenstone3/gsdl-manuals"/>34 <mkdir dir="compiled/gsdl-manuals"/> 35 35 <svn> 36 <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath=" greenstone3/gsdl-manuals/manuals" revision="${branch.revision}"/>37 <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath=" greenstone3/gsdl-manuals/shared" revision="${branch.revision}"/>36 <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals" revision="${branch.revision}"/> 37 <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared" revision="${branch.revision}"/> 38 38 </svn> 39 <javac srcdir=" greenstone3/gsdl-manuals/shared" destdir="greenstone3/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac>40 <unzip src=" greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>39 <javac srcdir="compiled/gsdl-manuals/shared" destdir="compiled/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac> 40 <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/> 41 41 42 42 <echo>Define Classpath</echo> 43 43 <path id="documentation.compile.classpath"> 44 <fileset dir=" greenstone3/gsdl-manuals">44 <fileset dir="compiled/gsdl-manuals"> 45 45 <include name="**/*.jar"/> 46 46 </fileset> 47 <pathelement path=" greenstone3/gsdl-manuals/shared"/>48 <pathelement path=" greenstone3/gsdl-manuals/manuals"/>49 <pathelement path=" greenstone3/gli/classes"/>47 <pathelement path="compiled/gsdl-manuals/shared"/> 48 <pathelement path="compiled/gsdl-manuals/manuals"/> 49 <pathelement path="compiled/gli/classes"/> 50 50 </path> 51 51 … … 53 53 <java classname="org.apache.xalan.xslt.Process" classpathref="documentation.compile.classpath" fork="true"> 54 54 <jvmarg value="-DGSDLHOME=${basedir}/greenstone" /> 55 <arg value="-IN"/><arg file=" greenstone3/gli/help/en/help.xml" />56 <arg value="-XSL"/><arg file=" greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />57 <arg value="-OUT"/><arg file=" greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml" />55 <arg value="-IN"/><arg file="compiled/gli/help/en/help.xml" /> 56 <arg value="-XSL"/><arg file="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 57 <arg value="-OUT"/><arg file="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml" /> 58 58 </java> 59 59 60 60 <echo>Run generate-pdf.bat</echo> 61 <exec dir="${basedir}\ greenstone3/gsdl-manuals/manuals" executable="cmd">61 <exec dir="${basedir}\compiled/gsdl-manuals/manuals" executable="cmd"> 62 62 <arg value="/C" /> 63 <arg file="${basedir}/ greenstone3/gsdl-manuals/manuals/generate-pdf.bat" />63 <arg file="${basedir}/compiled/gsdl-manuals/manuals/generate-pdf.bat" /> 64 64 <arg value="u" /> 65 65 <arg value="en" /> -
release-kits/wirk3/ant-scripts/create-components.xml
r17814 r17898 2 2 <project name="wirk3-create-components" default="create-components"> 3 3 4 <!-- create components from the distribution folder -->4 <!-- create components from the distributions folder --> 5 5 6 6 <!-- 1st level --> … … 44 44 45 45 <copy todir="components/tmp/core" overwrite="true"> 46 <fileset dir="distribution /greenstone3">46 <fileset dir="distributions/web"> 47 47 <include name="**/*"/> 48 48 … … 90 90 <mkdir dir="components/tmp/imagemagick"/> 91 91 <copy todir="components/tmp/imagemagick" overwrite="true"> 92 <fileset dir="distribution /greenstone3/gs2build/bin/windows/">92 <fileset dir="distributions/web/gs2build/bin/windows/"> 93 93 <include name="imagemagick/**/*"/> 94 94 </fileset> … … 108 108 <mkdir dir="components/tmp/ghostscript"/> 109 109 <copy todir="components/tmp/ghostscript" overwrite="true"> 110 <fileset dir="distribution /greenstone3/gs2build/bin/windows/">110 <fileset dir="distributions/web/gs2build/bin/windows/"> 111 111 <include name="ghostscript/**/*"/> 112 112 </fileset> … … 124 124 <mkdir dir="components/tmp/sourcecode"/> 125 125 <copy todir="components/tmp/sourcecode" overwrite="true"> 126 <fileset dir="distribution /greenstone3">126 <fileset dir="distributions/web"> 127 127 <include name="src/**/*"/> 128 128 <include name="gs2build/common-src/**/*"/> … … 145 145 146 146 <copy todir="components/tmp/ant" overwrite="true"> 147 <fileset dir="distribution /greenstone3/packages">147 <fileset dir="distributions/web/packages"> 148 148 <include name="ant/**/*"/> 149 149 </fileset> … … 161 161 <mkdir dir="components/tmp/tomcat"/> 162 162 <copy todir="components/tmp/tomcat" overwrite="true"> 163 <fileset dir="distribution /greenstone3/packages">163 <fileset dir="distributions/web/packages"> 164 164 <include name="tomcat/**/*"/> 165 165 </fileset> -
release-kits/wirk3/ant-scripts/create-distribution.xml
r17833 r17898 6 6 <!-- create distribution --> 7 7 <antcall target="export-greenstone3-gli" /> 8 <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution /greenstone3" /></antcall>9 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution /greenstone3/gli" /></antcall>8 <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web" /></antcall> 9 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli" /></antcall> 10 10 <antcall target="insert-user-manual"/> 11 11 <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets --> 12 12 13 <antcall target="copy-web-to-source -greenstone3" /> <!-- from gs3-targets -->13 <antcall target="copy-web-to-source" /> <!-- from gs3-targets --> 14 14 15 <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution /greenstone3" inheritAll="false">15 <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 16 16 <property name="app.version" value="${version}"/> 17 17 <property name="branch.path" value="${branch.path}"/> … … 21 21 <antcall target="insert-icon"/> 22 22 23 <ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution /greenstone3" inheritAll="false">23 <ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 24 24 <property name="app.version" value="${version}"/> 25 25 <property name="branch.path" value="${branch.path}"/> 26 26 <property name="branch.revision" value="${branch.revision}"/> 27 27 </ant> 28 <ant target="create-distribution-3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution /greenstone3" inheritAll="false">28 <ant target="create-distribution-3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 29 29 <property name="app.version" value="${version}"/> 30 30 <property name="branch.path" value="${branch.path}"/> … … 37 37 38 38 <target name="export-greenstone3-gli"> 39 <mkdir dir="distribution "/>40 <delete dir="distribution /greenstone3"/>39 <mkdir dir="distributions"/> 40 <delete dir="distributions/web"/> 41 41 <svn> 42 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution /greenstone3" revision="${branch.revision}"/>43 <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution /greenstone3/gli" revision="${branch.revision}"/>42 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web" revision="${branch.revision}"/> 43 <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli" revision="${branch.revision}"/> 44 44 </svn> 45 45 </target> … … 47 47 <target name="copy-over-build-xml"> 48 48 <if><bool><istrue value="${execute}"/></bool> 49 <move file="distribution /greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>49 <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/> 50 50 </if> 51 51 </target> 52 52 53 53 <target name="insert-user-manual"> 54 <copy file=" greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>54 <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/> 55 55 </target> 56 56 57 57 <target name="insert-compiled-binaries"> 58 58 59 <delete dir="distribution /greenstone3/lib/jni"/>60 <copy todir="distribution /greenstone3/lib/jni"><fileset dir="greenstone3/lib/jni"/></copy>59 <delete dir="distributions/web/lib/jni"/> 60 <copy todir="distributions/web/lib/jni"><fileset dir="compiled/lib/jni"/></copy> 61 61 62 <delete dir="distribution /greenstone3/gs2build/bin/windows"/>63 <copy todir="distribution /greenstone3/gs2build/bin/windows"><fileset dir="greenstone3/gs2build/bin/windows"/></copy>62 <delete dir="distributions/web/gs2build/bin/windows"/> 63 <copy todir="distributions/web/gs2build/bin/windows"><fileset dir="compiled/gs2build/bin/windows"/></copy> 64 64 65 <delete dir="distribution /greenstone3/gs2build/bin/java"/>66 <copy todir="distribution /greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy>65 <delete dir="distributions/web/gs2build/bin/java"/> 66 <copy todir="distributions/web/gs2build/bin/java"><fileset dir="compiled/gs2build/bin/java"/></copy> 67 67 68 <copy todir="distribution /greenstone3/bin" file="greenstone3/bin/search4j.exe"/>68 <copy todir="distributions/web/bin" file="compiled/bin/search4j.exe"/> 69 69 </target> 70 70 … … 72 72 <copy 73 73 file="${wirk3.home}/greenstone3/icon/icon.ico" 74 tofile="distribution/greenstone3/resources/images/gs3.ico"/> 75 </target> 76 77 <target name="rename-build-xml-for-transit"> 78 <move 79 file="distribution/greenstone3/build.xml" 80 tofile="distribution/greenstone3/greenstone3-build.xml" /> 74 tofile="distributions/web/resources/images/gs3.ico"/> 81 75 </target> 82 76 -
release-kits/wirk3/ant-scripts/create-installer.xml
r17697 r17898 15 15 <copy todir="${basedir}/installer/classes" overwrite="true"> 16 16 <fileset dir="${wirk3.home}/packages/7za" includes="7za.exe"/> 17 <fileset file="${basedir}/distribution /greenstone3/LICENSE.txt"/>17 <fileset file="${basedir}/distributions/web/LICENSE.txt"/> 18 18 </copy> 19 19
Note:
See TracChangeset
for help on using the changeset viewer.
