Changeset 19510


Ignore:
Timestamp:
2009-05-18T15:36:40+12:00 (12 years ago)
Author:
oranfry
Message:

main release kits now create their own cdrom installers and wrap them

Location:
release-kits
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • release-kits/lirk2/ant-scripts/create-installer.xml

    r19006 r19510  
    66        <antcall target="make-installer-files-concrete"><param name="java.os" value="linux"/></antcall> <!-- from init -->
    77        <antcall target="compile-binary-installer"/> <!-- from init -->
    8         <antcall target="compile-minimal-installer"/> <!-- from init -->
     8        <antcall target="compile-cdrom-installer"/> <!-- from init -->
    99    </target>
    1010
  • release-kits/lirk2/ant-scripts/wrap.xml

    r19006 r19510  
    44    <target name="wrap">
    55        <antcall target="setup-for-wrapping"/>
    6         <antcall target="compile-wrapper"/>
     6        <antcall target="create-objects"/>
     7        <antcall target="compile-wrapper-web"/>
     8        <antcall target="compile-wrapper-cdrom"/>
    79    </target>
    810
     
    1113
    1214        <!-- create and setup the build directory -->
    13         <mkdir dir="${basedir}/wrapped-installer/build"/>
    14         <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/wrapper.cpp"/>
    15         <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/core/search4j/libsearch4j.cpp"/>
    16         <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/core/search4j/libsearch4j.h"/>
     15        <mkdir dir="${basedir}/wrapped-installer"/>
     16        <copy todir="${basedir}/wrapped-installer" file="${lirk2.home}/linux/wrapper.cpp"/>
     17        <copy todir="${basedir}/wrapped-installer" file="${lirk2.home}/core/search4j/libsearch4j.cpp"/>
     18        <copy todir="${basedir}/wrapped-installer" file="${lirk2.home}/core/search4j/libsearch4j.h"/>
    1719
    1820        <!-- copy bundled files -->
    19         <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${linux-java.installer}"/>
    20         <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/Greenstone-${version}-linux.jar"/>
     21        <copy todir="${basedir}/wrapped-installer" file="${lirk2.home}/linux/${linux-java.installer}"/>
     22        <copy tofile="${basedir}/wrapped-installer/greenstone2.jar" file="${basedir}/installer/Greenstone-${version}-linux.jar"/>
    2123
    2224        <!-- substitute in real values -->
    23         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/>
    24         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone2"/>
    25         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
    26         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
     25        <rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/>
     26        <rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@installer.name@" replacement="greenstone2"/>
     27        <rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
     28        <rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
    2729
    2830    </target>
    2931
    30     <target name="compile-wrapper">
     32    <target name="create-objects">
    3133
    3234        <echo level="info">create an object file (extension .o) for each file to bundle</echo>
    33         <!-- jar -->
    34         <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
     35        <!-- jar (web) -->
     36        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer">
    3537            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_jar_start=greenstone2jar --readonly-text greenstone2.jar greenstone2.jar.o"/>
    3638        </exec>
     39        <!-- jar (cdrom) -->
     40        <exec executable="/usr/bin/objcopy" dir="installer">
     41            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_cdrom_jar_start=greenstone2jar --readonly-text cdrom.jar ../wrapped-installer/cdrom.jar.o"/>
     42        </exec>
    3743        <!-- java -->
    38         <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
     44        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer">
    3945            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
    4046        </exec>
    4147
     48        <echo level="info">compile libsearch4j</echo>
     49        <exec executable="g++" dir="wrapped-installer">
     50            <arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/>
     51        </exec>
     52
     53    </target>
     54
     55    <target name="calculate-object-sizes">
     56
    4257        <echo level="info">working out the size of the objects</echo>
    43         <!-- jar -->
    44         <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec>
     58        <!-- jar(web) -->
     59        <exec executable="ls" dir="wrapped-installer" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec>
    4560        <exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    4661
     62        <!-- jar(cdrom) -->
     63        <exec executable="ls" dir="installer" outputproperty="cdrom.jar.ls"><arg line="-l cdrom.jar"/></exec>
     64        <exec executable="sed" inputstring="${cdrom.jar.ls}" outputproperty="cdrom.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
     65
    4766        <!-- java -->
    48         <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
     67        <exec executable="ls" dir="wrapped-installer" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
    4968        <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
     69
     70    </target>
     71
     72    <target name="compile-wrapper-web" depends="calculate-object-sizes">
    5073
    5174        <echo level="info">creating wrapper header file</echo>
    5275        <delete file="wrapper.h"/>
    53         <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.jar.size}];"/></exec>
    54         <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
    55         <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
    56 
    57         <echo level="info">compile libsearch4j</echo>
    58         <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    59             <arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/>
    60         </exec>
     76        <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.jar.size}];"/></exec>
     77        <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
     78        <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
    6179
    6280        <echo level="info">compile the wrapper program</echo>
    63         <exec executable="g++" dir="${basedir}/wrapped-installer/build">
     81        <exec executable="g++" dir="wrapped-installer">
    6482            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
    6583        </exec>
    6684
    6785        <echo level="info">link the compiled code and bundled files</echo>
    68         <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    69             <arg line="-static -static-libgcc -o ../../products/Greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o java.o"/>
     86        <exec executable="g++" dir="${basedir}/wrapped-installer">
     87            <arg line="-static -static-libgcc -o ../products/Greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o java.o"/>
     88        </exec>
     89
     90    </target>
     91
     92    <target name="compile-wrapper-cdrom" depends="calculate-object-sizes">
     93
     94        <echo level="info">creating wrapper header file</echo>
     95        <delete file="wrapper.h"/>
     96        <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h"><arg line="extern const char greenstone2jar[${cdrom.jar.size}];"/></exec>
     97        <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
     98        <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
     99
     100        <echo level="info">compile the wrapper program</echo>
     101        <exec executable="g++" dir="wrapped-installer">
     102            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
     103        </exec>
     104
     105        <echo level="info">link the compiled code and bundled files</echo>
     106        <exec executable="g++" dir="${basedir}/wrapped-installer">
     107            <arg line="-static -static-libgcc -o ../products/cdrom-linux.bin wrapper.o libsearch4j.o cdrom.jar.o java.o"/>
    70108        </exec>
    71109
  • release-kits/lirk2/installer/build.xml

    r19503 r19510  
    4949        <!-- start cdrom -->
    5050        <copy todir="${installDir}">
    51             <fileset dir="${cd.dir}/Software/core/all"/>
    52             <fileset dir="${cd.dir}/Software/core/linux"/>
     51            <fileset dir="${orig.dir}/Software/core/all"/>
     52            <fileset dir="${orig.dir}/Software/core/linux"/>
    5353        </copy>
    5454        <!-- end cdrom -->
     
    107107    <target name="Installing ImageMagick">
    108108        <echo>Installing ImageMagick</echo>
     109        <!-- start web -->
    109110        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
    110111        <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
     
    112113        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/linux"/>
    113114        <delete file="imagemagick.comp"/>
    114        
     115        <!-- end web -->
     116
     117        <!-- start cdrom -->
     118        <copy todir="${installDir}/bin/linux">
     119            <fileset dir="${orig.dir}/Software/imagemagick/linux"/>
     120        </copy>
     121        <!-- end cdrom -->
     122
    115123        <echo>Setting ImageMagick Binaries to Executable</echo>
    116124        <chmod dir="${installDir}/bin/linux/imagemagick/bin" includes="*" perm="775"/>
    117125       
    118     </target>
    119 
    120     <!-- source release -->
    121     <target name="Source Release">
    122 
    123         <echo>Installing Source Release</echo>
    124         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
    125         <sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
    126         <delete file="source-release.lzma"/>
    127         <unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
    128         <delete file="source-release.comp"/>
    129 
    130         <echo>Setting Binaries to Executable</echo>
    131         <chmod dir="${installDir}" includes="*.sh,*.bash,**/configure" perm="775"/>
    132         <chmod dir="${installDir}/bin/linux" includes="*" perm="775"/>
    133         <chmod dir="${installDir}/bin" includes="*" perm="775"/>
    134         <chmod dir="${installDir}/cgi-bin" includes="*" perm="775"/>
    135         <chmod dir="${installDir}/bin/script" includes="**/*" perm="775"/>
    136         <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
    137         <echo/>
    138 
    139         <echo>Filling in concrete values in config files</echo>
    140         <rsr file="${installDir}/cgi-bin/gsdlsite.cfg">
    141             <job pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
    142             <job pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/>
    143             <job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/>
    144         </rsr>
    145         <echo/>
    146 
    147         <echo>Set the installation locale in config files</echo>
    148         <rsr file="${installDir}/setup.bash" pattern="^gsdllang=.*" replacement="gsdllang=${language}"/>
    149         <rsr file="${installDir}/gli/gli.sh" pattern="^glilang=.*" replacement="glilang=${language}"/>
    150         <rsr file="${installDir}/gli/gems.sh" pattern="^glilang=.*" replacement="glilang=${language}"/>
    151 
    152         <rsr
    153             file="${installDir}/gli/classes/xml/config.xml"
    154             pattern="(&lt;Argument name=&quot;general.locale&quot;&gt;).*(&lt;/Argument&gt;)"
    155             replacement="$1${language}$2"/>
    156 
    157         <echo file="${installDir}/etc/main.cfg" append="true"
    158             >cgiarg          shortname=l argdefault=${language}</echo>
    159 
    160         <echo>Create usage.txt</echo>
    161         <echo file="${installDir}/etc/usage.txt"></echo>
    162 
    163         <echo>Creating installation properties file</echo>
    164         <echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo>
    165 
    166126    </target>
    167127
  • release-kits/mark2/ant-scripts/create-installer.xml

    r19006 r19510  
    66        <antcall target="make-installer-files-concrete"/>  <!-- from init -->
    77        <antcall target="compile-binary-installer"/> <!-- from init -->
    8         <antcall target="compile-minimal-installer"/> <!-- from init -->
     8        <antcall target="compile-cdrom-installer"/> <!-- from init -->
    99    </target>
    1010
  • release-kits/mark2/ant-scripts/wrap.xml

    r19460 r19510  
    33
    44    <target name="wrap">
     5
     6        <!-- create products directory -->
     7        <mkdir dir="products"/>
     8
    59        <!-- create and setup the build directory -->
    610        <delete dir="${basedir}/wrapped-installer"/>
    711        <mkdir dir="${basedir}/wrapped-installer"/>
    8         <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
    9         <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
    10         <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
    1112
    12         <!-- copy bundled files -->
    13         <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"/>
     13        <!-- create app for main installer -->
     14            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
     15            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
     16            <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
    1417
    15         <!-- substitute in real values -->
    16         <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-${processor}.jar"/>
    17         <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
     18            <!-- copy bundled files -->
     19            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"/>
     20
     21            <!-- substitute in real values -->
     22            <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-${processor}.jar"/>
     23            <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
     24
     25
     26        <!-- create app for cdrom installer -->
     27            <copy todir="${basedir}/products/cdrom.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
     28            <copy todir="${basedir}/products/cdrom.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
     29            <chmod file="${basedir}/products/cdrom.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
     30
     31            <!-- copy bundled files -->
     32            <copy todir="${basedir}/products/cdrom.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
     33
     34            <!-- substitute in real values -->
     35            <rsr file="${basedir}/products/cdrom.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
     36            <rsr file="${basedir}/products/cdrom.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
     37
     38        <!-- wrap main app in a dmg -->
    1839
    1940        <!-- get size of app -->
     
    2546        <echo>dmg.size: ${dmg.size}</echo>
    2647
    27         <!-- create products directory -->
    28         <mkdir dir="products"/>
    2948
    3049        <!-- create disk image -->
  • release-kits/mark2/installer/build.xml

    r19256 r19510  
    2929
    3030        <echo>Installing Core Files</echo>
     31        <!-- start web -->
    3132        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
    3233        <sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/>
     
    3435        <unzip src="${basedir}/core.comp" dest="${installDir}"/>
    3536        <delete file="core.comp"/>
     37        <!-- end web -->
     38
     39        <!-- start cdrom -->
     40        <copy todir="${installDir}">
     41            <fileset dir="${orig.dir}/Software/core/all"/>
     42            <fileset dir="${orig.dir}/Software/core/mac"/>
     43        </copy>
     44        <!-- end cdrom -->
    3645
    3746        <echo message="Setting Binaries to Executable"/>
     
    8089    <target name="Installing ImageMagick" depends="">
    8190        <echo message="Installing ImageMagick"/>
     91        <!-- start web -->
    8292        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
    8393        <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
     
    8595        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/darwin" />
    8696        <delete file="imagemagick.comp"/>
     97        <!-- end web -->
     98
     99        <!-- start cdrom -->
     100        <copy todir="${installDir}/bin/darwin">
     101            <fileset dir="${orig.dir}/Software/imagemagick/mac"/>
     102        </copy>
     103        <!-- start cdrom -->
     104
    87105        <chmod dir="${installDir}/bin/darwin/imagemagick/bin" includes="*" perm="775"/>
    88106    </target>
     
    91109    <target name="Installing Ghostscript" depends="">
    92110        <echo message="Installing Ghostscript"/>
     111        <!-- start web -->
    93112        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
    94113        <sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/>
     
    96115        <unzip src="${basedir}/ghostscript.comp" dest="${installDir}/bin/darwin" />
    97116        <delete file="ghostscript.comp"/>
    98         <chmod dir="${installDir}/bin/darwin/ghostscript/bin" includes="*" perm="775"/>
    99     </target>
     117        <!-- end web -->
     118
     119        <!-- start cdrom -->
     120        <copy todir="${installDir}/bin/darwin">
     121            <fileset dir="${orig.dir}/Software/ghostscript/mac"/>
     122        </copy>
     123        <!-- start cdrom -->
    100124
    101125
    102     <target name="Source Release" depends="">
    103 
    104         <!-- create the installation directory -->
    105         <echo message="Creating Installation directory"/>
    106         <mkdir dir="${installDir}"/>
    107 
    108         <echo>Installing Source Release</echo>
    109         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
    110         <sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
    111         <delete file="source-release.lzma"/>
    112         <unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
    113         <delete file="source-release.comp"/>
    114 
    115         <echo message="Setting Binaries to Executable"/>
    116         <chmod dir="${installDir}" includes="*.sh,*.bash" perm="775"/>
    117         <chmod dir="${installDir}/bin/darwin" includes="*" perm="775"/>
    118         <chmod dir="${installDir}/bin" includes="*" perm="775"/>
    119         <chmod dir="${installDir}/cgi-bin" includes="*" perm="775"/>
    120         <chmod dir="${installDir}/bin/script" includes="**/*" perm="775"/>
    121         <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
    122         <echo/>
    123 
    124         <echo message="Filling in concrete values in config files"/>
    125         <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
    126         <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/>
    127         <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/>
    128         <echo/>
    129 
    130         <echo>Create usage.txt</echo>
    131         <echo file="${installDir}/etc/usage.txt"></echo>
    132 
    133         <echo>Creating installation properties file</echo>
    134         <echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo>
    135 
    136         <echo message="Finished"/>
    137 
     126        <chmod dir="${installDir}/bin/darwin/ghostscript/bin" includes="*" perm="775"/>
    138127    </target>
    139128
  • release-kits/shared/core/ant-scripts/init.xml

    r19472 r19510  
    154154        <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-binary.xml"/>
    155155        <dcff file="${basedir}/installer/antinstall-config-binary.xml" startTag=".*&lt;!-- start source release --&gt;.*" endTag=".*&lt;!-- end source release --&gt;.*" />
     156
     157        <copy file="${basedir}/installer/build.xml" tofile="${basedir}/installer/build-binary.xml"/>
     158        <dcff file="${basedir}/installer/build-binary.xml" startTag=".*&lt;!-- start cdrom --&gt;.*" endTag=".*&lt;!-- end cdrom --&gt;.*" />
     159
    156160        <installer file="${basedir}/installer/Greenstone-${version}-${os.suffix}.jar"
    157161            compress="true"
    158162            extractType="NonExtractor"
    159163            installConfig="${basedir}/installer/antinstall-config-binary.xml"
    160             buildFile="${basedir}/installer/build.xml"
     164            buildFile="${basedir}/installer/build-binary.xml"
    161165            antInstallLib="${rk.home}/core/ant-installer/lib"
    162166            antLib="${rk.home}/core/ant/lib"
     
    167171            <zipfileset dir="${basedir}/components" includes="*.lzma" excludes="source-release.lzma" />
    168172
     173        </installer>
     174       
     175    </target>
     176
     177    <target name="compile-cdrom-installer">
     178
     179        <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-cdrom.xml"/>
     180        <dcff file="${basedir}/installer/antinstall-config-cdrom.xml" startTag=".*&lt;!-- start source release --&gt;.*" endTag=".*&lt;!-- end source release --&gt;.*" />
     181
     182        <copy file="${basedir}/installer/build.xml" tofile="${basedir}/installer/build-cdrom.xml"/>
     183        <dcff file="${basedir}/installer/build-cdrom.xml" startTag=".*&lt;!-- start web --&gt;.*" endTag=".*&lt;!-- end web --&gt;.*" />
     184
     185        <installer file="${basedir}/installer/cdrom.jar"
     186            compress="true"
     187            extractType="NonExtractor"
     188            installConfig="${basedir}/installer/antinstall-config-cdrom.xml"
     189            buildFile="${basedir}/installer/build-cdrom.xml"
     190            antInstallLib="${rk.home}/core/ant-installer/lib"
     191            antLib="${rk.home}/core/ant/lib"
     192            validateConfig="true"
     193            icons="bluecurve">
     194            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
    169195        </installer>
    170196       
  • release-kits/shared/linux/wrapper.cpp

    r19327 r19510  
    1212
    1313int main(int argc, char** argv) {
     14
     15    char owd[1024];
     16    getcwd(owd, sizeof(owd));
    1417
    1518    string scratch = (getenv("TMPDIR") == NULL) ? "/tmp" : getenv("TMPDIR");
     
    104107        cout << "Launching Installer ..." << endl;
    105108        int launch_exit_code = 0;
    106         launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx85M -jar @installer.name@.jar" + (textMode?" text":"") ).c_str() );
     109        launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx85M \"-Dorig.dir=" + owd + "\" -jar @installer.name@.jar" + (textMode?" text":"") ).c_str() );
    107110
    108111        //report how it went
  • release-kits/wirk2/ant-scripts/create-installer.xml

    r19006 r19510  
    66        <antcall target="make-installer-files-concrete"><param name="java.os" value="windows"/></antcall> <!-- from init -->
    77        <antcall target="compile-binary-installer"/> <!-- from init -->
    8         <antcall target="compile-minimal-installer"/> <!-- from init -->
     8        <antcall target="compile-cdrom-installer"/> <!-- from init -->
    99    </target>
    1010
  • release-kits/wirk2/installer/build.xml

    r19379 r19510  
    5757        <!-- install files -->
    5858        <echo message="Installing Core Component"/>
     59
     60        <!-- start web -->
    5961        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
    6062        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x core.lzma"/></exec>
    61         <!--<sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/>-->
    6263        <delete file="core.lzma"/>
    6364        <unzip src="${basedir}/core.comp" dest="${installDir}"/>
    6465        <delete file="core.comp"/>
     66        <!-- end web -->
     67
     68        <!-- start cdrom -->
     69        <copy todir="${installDir}">
     70            <fileset dir="${orig.dir}/Software/core/all"/>
     71            <fileset dir="${orig.dir}/Software/core/windows"/>
     72        </copy>
     73        <!-- end cdrom -->
    6574
    6675        <!-- jre -->
     
    8796    <target name="Installing ImageMagick">
    8897        <echo message="Installing ImageMagick"/>
     98        <!-- start web -->
    8999        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
    90100        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec>
    91         <!--<sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>-->
    92101        <delete file="imagemagick.lzma"/>
    93102        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/windows"/>
    94103        <delete file="imagemagick.comp"/>
     104        <!-- end web -->
     105
     106        <!-- start cdrom -->
     107        <copy todir="${installDir}/bin/windows">
     108            <fileset dir="${orig.dir}/Software/imagemagick/windows"/>
     109        </copy>
     110        <!-- end cdrom -->
     111
    95112    </target>
    96113
    97114    <target name="Installing Ghostscript">
    98115        <echo message="Installing GhostScript"/>
     116        <!-- start web -->
    99117        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
    100118        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec>
    101         <!--<sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/>-->
    102119        <delete file="ghostscript.lzma"/>
    103120        <unzip src="${basedir}/ghostscript.comp" dest="${installDir}/bin/windows"/>
    104121        <delete file="ghostscript.comp"/>
     122        <!-- end web -->
     123
     124        <!-- start cdrom -->
     125        <copy todir="${installDir}/bin/windows">
     126            <fileset dir="${orig.dir}/Software/ghostscript/windows"/>
     127        </copy>
     128        <!-- end cdrom -->
     129
    105130    </target>
    106131   
Note: See TracChangeset for help on using the changeset viewer.