Changeset 16655


Ignore:
Timestamp:
2008-08-06T15:07:41+12:00 (13 years ago)
Author:
oranfry
Message:

got mark3 working

Location:
release-kits/mark3
Files:
8 edited
1 moved

Legend:

Unmodified
Added
Removed
  • release-kits/mark3

    • Property svn:externals
      •  

        old new  
        22linux http://svn.greenstone.org/release-kits/shared/linux
        33greenstone3 http://svn.greenstone.org/release-kits/shared/greenstone3
         4mac http://svn.greenstone.org/release-kits/shared/mac
        45
  • release-kits/mark3/ant-scripts/build.xml

    r16243 r16655  
    33<!--
    44        ..........................................................
    5         February 2008
    6         Linux Release Kit for Greenstone3 (lirk3)
     5        July 2008
     6        Mac Release Kit for Greenstone3 (mark3)
    77        Oran Fry
    88        ..........................................................
    99-->
    1010
    11 <project name="lirk3-build" default="lirk3">
     11<project name="mark3-build" default="mark3">
    1212
    1313    <!-- CONSTANTS -->
     
    2222
    2323    <!-- for the benefit of the shared scripts, set release-kit home -->
    24     <property name="rk.home" value="${lirk3.home}" />
     24    <property name="rk.home" value="${mark3.home}" />
    2525
    2626
     
    3232    <import file="wrap.xml"/>
    3333
     34    <!-- TARGET TO PERFORM ADDITIONAL PRECONDITION CHECKS -->
     35    <target name="mark3-init">
     36        <echo>Determining Processor...</echo>
     37        <if>
     38            <bool>
     39                <or><equals arg1="${processor}" arg2="ppc" /><equals arg1="${processor}" arg2="intel"/></or>
     40            </bool>
     41
     42            <echo>Processor: ${processor}</echo>
     43            <echo/>
     44
     45            <else>
     46                <echo>Processor type not set or set wrongly. Please set the property 'processor' to either 'intel' or 'ppc' in build.properties</echo>
     47                <fail>Processor not set</fail>
     48            </else>
     49        </if>
     50    </target>
     51
    3452    <!-- THE MAIN TARGET -->
    35     <target name="lirk3" depends="init">
     53    <target name="mark3" depends="init,mark3-init">
    3654        <addressedcall target="compile"/>
    3755        <addressedcall target="create-distribution"/>
  • release-kits/mark3/ant-scripts/compile.xml

    r16172 r16655  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 <project name="lirk3-compile" default="compile">
     2<project name="mark3-compile" default="compile">
    33
    44
     
    1010        <!-- preparation -->
    1111        <addressedcall target="set-version-number-property" />
     12        <addressedcall target="set-gdbm-installed-path" />
    1213        <addressedcall target="dist-prepare-unix" />
    13         <addressedcall target="tweak-configure-scripts" />
    1414
    1515        <!-- update -->
     
    2222        <!-- build -->
    2323        <addressedcall target="dist-build-unix" />
    24         <addressedcall target="fix-wget" />
    2524        <addressedcall target="linux-strip-execs" />
    2625
     
    4140        <if><bool><istrue value="${execute}"/></bool>
    4241            <rsr file="greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
     42
    4343        </if>
    4444    </target>
    4545
     46    <target name="set-gdbm-installed-path">
     47        <if><bool><istrue value="${execute}"/></bool>
     48            <rsr file="greenstone3/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/>
     49        </if>
     50    </target>
     51
     52
     53
     54
    4655    <target name="dist-prepare-unix">
    4756        <if><bool><istrue value="${execute}"/></bool>
    48             <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
     57            <ant dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
    4958        </if>   
    50     </target>
    51     <target name="tweak-configure-scripts">
    52         <addressedcall target="mgpp-add-static" />
    53         <addressedcall target="mg-add-static" />
    54         <addressedcall target="gs2buildextra-add-static" />
    5559    </target>
    5660
    5761    <target name="dist-update-unix">
    5862        <if><bool><istrue value="${execute}"/></bool>
    59             <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
     63            <ant dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
    6064        </if>
    6165    </target>
     
    6367    <target name="dist-configure-unix">
    6468        <if><bool><istrue value="${execute}"/></bool>
    65             <exec dir="greenstone3/gs2build/gs2build-extra" executable="autoconf" output="greenstone3/gs2build/configure">
    66                 <arg line="configure.in"/>
    67             </exec>
    68             <chmod file="greenstone3/gs2build/configure" perm="+x"/>
    69             <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
     69            <ant dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
    7070        </if>
    7171    </target>
    7272
    73     <target name="tweak-makefiles">
    74         <addressedcall target="wv-add-static" />
    75         <addressedcall target="xlhtml-add-static" />
    76         <addressedcall target="ppthtml-add-static" />
    77         <addressedcall target="rtftohtml-add-static" />
    78         <addressedcall target="gdbm-add-static" />
    79     </target>
     73        <target name="tweak-makefiles">
     74                <if><bool><istrue value="${execute}"/></bool>
     75               <rsr
     76                file="${basedir}/greenstone3/gs2build/common-src/src/gdbmedit/db2txt/Makefile"
     77                pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
     78                replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
     79
     80                <rsr
     81                file="${basedir}/greenstone3/gs2build/common-src/src/gdbmedit/txt2db/Makefile"
     82                pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
     83                replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
     84                <rsr
     85                file="${basedir}/greenstone3/src/packages/javagdbm/jni/Makefile"
     86                pattern="^(GDBM_LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
     87                replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
     88
     89               </if>
     90        </target>
    8091
    8192    <target name="dist-build-unix">
    8293        <if><bool><istrue value="${execute}"/></bool>
    83             <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
    84         </if>
    85     </target>
    86 
    87     <target name="fix-wget">
    88         <if><bool><istrue value="${execute}"/></bool>
    89             <!-- fix this !!! -->
    90           <delete file="greenstone3/gs2build/packages/wget/wget-1.9/src/wget"/>
     94            <ant dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
    9195        </if>
    9296    </target>
     
    9498    <target name="linux-strip-execs">
    9599        <if><bool><istrue value="${execute}"/></bool>
    96             <exec dir="greenstone3/gs2build/bin/linux" executable="find">
    97                 <arg line="! -name . -exec strip {} &#59;"/>
     100            <exec dir="greenstone3/gs2build/bin/darwin" executable="find">
     101                <arg line=". ! -name . -exec strip {} &#59;"/>
    98102            </exec>
    99103        </if>
     
    191195    </target>
    192196
     197</project>
    193198
    194 
    195 </project>
  • release-kits/mark3/ant-scripts/create-distribution.xml

    r16269 r16655  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 <project name="lirk3-create-distribution" default="create-distribution">
     2<project name="mark3-create-distribution" default="create-distribution">
    33
    44
     
    3737    <target name="dist-set-gli-version">
    3838        <if><bool><istrue value="${execute}"/></bool>
    39             <ant antfile="${lirk3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/>
     39            <ant antfile="${mark3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/>
    4040        </if>
    4141    </target>
     
    4444    <target name="create-distributions-1">
    4545        <if><bool><istrue value="${execute}"/></bool>
    46             <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
     46            <ant antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
    4747                <property name="app.version" value="${version}"/>
    4848                <property name="branch.path" value="${branch.path}"/>
     
    5353    <target name="create-distributions-2">
    5454        <if><bool><istrue value="${execute}"/></bool>
    55             <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2"  inheritAll="false">
     55            <ant antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2"  inheritAll="false">
    5656                <property name="app.version" value="${version}"/>
    5757                <property name="branch.path" value="${branch.path}"/>
     
    6262    <target name="create-distributions-3">
    6363        <if><bool><istrue value="${execute}"/></bool>
    64             <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3"  inheritall="false">
     64            <ant antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3"  inheritall="false">
    6565                <property name="app.version" value="${version}"/>
    6666                <property name="branch.path" value="${branch.path}"/>
  • release-kits/mark3/ant-scripts/create-installer.xml

    r16277 r16655  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 <project name="lirk3-create-installer" default="create-installer">
     2<project name="mark3-create-installer" default="create-installer">
    33
    44    <target name="create-installer">
     
    2121            <echo>Getting things ready to compile the installer</echo>
    2222            <mkdir dir="${basedir}/installer/resources"/>
    23             <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml" overwrite="true" />
    24             <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml" overwrite="true" />
     23            <copy todir="${basedir}/installer" file="${mark3.home}/installer/antinstall-config.xml" overwrite="true" />
     24            <copy todir="${basedir}/installer" file="${mark3.home}/installer/build.xml" overwrite="true" />
    2525            <copy todir="${basedir}/installer/classes" overwrite="true">
    26                 <fileset dir="${lirk3.home}/greenstone3/installer-classes"/>
    27                 <fileset dir="${lirk3.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
     26                <fileset dir="${mark3.home}/greenstone3/installer-classes"/>
     27                <fileset dir="${mark3.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
    2828            </copy>
    2929
     
    6060        <if><bool><istrue value="${execute}"/></bool>
    6161
    62             <installer file="${basedir}/installer/greenstone3-with-java.jar"
     62            <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"
    6363                    compress="true"
    6464                    extractType="NonExtractor"
    6565                    installConfig="${basedir}/installer/antinstall-config.xml"
    6666                    buildFile="${basedir}/installer/build.xml"
    67                     antInstallLib="${lirk3.home}/packages/ant-installer/lib"
    68                     antLib="${lirk3.home}/packages/ant/lib"
     67                    antInstallLib="${mark3.home}/packages/ant-installer/lib"
     68                    antLib="${mark3.home}/packages/ant/lib"
    6969                    validateConfig="true"
    7070                    failOnError="false"
     
    7676
    7777            </installer>
    78 
    79             <!-- delete the 'bundled java only' lines from the installer config -->
    80             <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
    81 
    82             <installer file="${basedir}/installer/greenstone3.jar"
    83                     compress="true"
    84                     extractType="NonExtractor"
    85                     installConfig="${basedir}/installer/antinstall-config.xml"
    86                     buildFile="${basedir}/installer/build.xml"
    87                     antInstallLib="${lirk3.home}/packages/ant-installer/lib"
    88                     antLib="${lirk3.home}/packages/ant/lib"
    89                     validateConfig="true"
    90                     icons="bluecurve">
    91 
    92                 <zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
    93                 <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
    94             </installer>
    9578        </if>
    9679    </target>
  • release-kits/mark3/ant-scripts/operations-on-gs3home.xml

    r16522 r16655  
    2828    <target name="update-unix" depends="init">
    2929        <antcall target="svnupdate-distribution"/>
    30         <antcall target="rename-gs2build-files-unix"/>
    3130        <antcall target="delete-windows-files"/>
    3231    </target>
     
    4746        <antcall target="checkout-gs2build"/>
    4847
    49         <!--
    50         gli is now checked out by create-distribution.xml
    51         so it already exists
    52         <antcall target="checkout-gli"/>
    53         -->
    54 
    5548        <delete><fileset dir="." includes="*.bat"/></delete>
    56         <!--<delete file="${gli.home}/gli.sh"/>-->
    57         <delete file="${gli.home}/gems.sh"/>
    58         <antcall target="rename-gs2build-files-dist"/>   
    5949        <delete dir="${gs2build.home}/gs2build-extra"/>
    6050
     
    8272        <delete file="${basedir}/README-CVS.txt"/>
    8373        <delete file="${basedir}/TODO.txt"/>
    84 
    85         <!-- make the extra directories needed for a release -->
    86         <!--<mkdir dir="${basedir}/Linux/lib/jni"/>
    87         <mkdir dir="${gs2build.home}/Unix/bin/linux"/>-->
    8874
    8975    </target>
     
    127113        <delete dir="${basedir}/gs2build/source"/>
    128114
    129         <delete file="${basedir}/gs2build/WIN32cfg.h"/>
     115        <delete file="${basedir}/gs2build/win32cfg.h"/>
    130116        <delete file="${basedir}/gs2build/win32.mak"/>
    131117
     
    142128
    143129    <target name="run-xslt-binary" depends="init">
    144         <xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${lirk3.home}/greenstone3/xsl/convert-build-xml.xsl"/>
     130        <xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${mark3.home}/greenstone3/xsl/convert-build-xml.xsl"/>
    145131    </target>
    146132
    147133    <target name="run-xslt-source" depends="init">
    148         <xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${lirk3.home}/greenstone3/xsl/convert-build-xml-source.xsl"/>
     134        <xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${mark3.home}/greenstone3/xsl/convert-build-xml-source.xsl"/>
    149135    </target>
    150136 
    151     <target name="rename-gs2build-files-dist" depends="init,rename-gs2build-files-unix">
    152         <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/>
    153         <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/>
    154         <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/>
    155     </target>   
    156 
    157137  <target name="configure-packages-and-indexers" depends="init">
    158138    <exec executable="${indexers.home}/configure"
     
    185165   
    186166    <!-- javagdbm -->
     167    <!-- skip compile, just get compiled jar from /greenstone3 directory
    187168    <exec executable="make" os="${os.unix}"
    188169      dir="${javagdbm.home}">
     
    193174      <arg value="installjava"/>
    194175    </exec>
     176    -->
     177
    195178    <!-- install the jar file -->
    196     <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
     179    <copy file="../../greenstone3/src/packages/javagdbm/javagdbm.jar" todir="${lib.jni}"/>
    197180
    198181  </target>
  • release-kits/mark3/ant-scripts/wrap.xml

    r16243 r16655  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 <project name="lirk3-wrap" default="wrap">
     2<project name="mark3-wrap" default="wrap">
    33
    44    <target name="wrap">
    5         <addressedcall target="setup-for-wrapping"/>
    6         <addressedcall target="compile-wrapper"/>
    7     </target>
    8 
    9     <target name="setup-for-wrapping">
    105        <if><bool><istrue value="${execute}"/></bool>
    116
    127            <!-- create and setup the build directory -->
    13             <mkdir dir="${basedir}/wrapped-installer/build"/>
    14             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/wrapper.cpp" overwrite="true" />
    15             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.cpp" overwrite="true" />
    16             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.h" overwrite="true" />
     8            <delete dir="${basedir}/wrapped-installer"/>
     9            <mkdir dir="${basedir}/wrapped-installer"/>
     10            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark3.home}/mac/Wrapper.app"/></copy>
     11            <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
    1712
    1813            <!-- copy bundled files -->
    19             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/>
    20             <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
    21             <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3-with-java.jar"/>
     14            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"/>
    2215
    23             <!-- substitute the real java installer filename and min version into various files -->
    24             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/>
    25             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone3"/>
    26             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
    27             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
     16            <!-- substitute in real values -->
     17            <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-${processor}.jar"/>
     18            <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
    2819
    29         </if>
    30     </target>
     20                        <!-- get size of app -->
     21                        <exec executable="du" dir="${basedir}/wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version}.app"/></exec>
     22            <echo>app.du: ${app.du}</echo>
     23                        <exec executable="sed" inputstring="${app.du}" outputproperty="app.size"><arg line="-e 's/^\([0-9]*\).*$/\1/g'"/></exec>
     24            <echo>app.size: ${app.size}</echo>
     25            <math result="dmg.size" operand1="${app.size}" operation="+" operand2="2048" datatype="int"/>
     26            <echo>dmg.size: ${dmg.size}</echo>
    3127
    32     <target name="compile-wrapper">
    33         <if><bool><istrue value="${execute}"/></bool>
    34 
    35             <echo level="info">create an object file (extension .o) for each file to bundle</echo>
    36             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    37                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_jar_start=greenstone3jar --readonly-text greenstone3.jar greenstone3.jar.o"/>
    38             </exec>
    39             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    40                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_with_java_jar_start=greenstone3jar --readonly-text greenstone3-with-java.jar greenstone3-with-java.jar.o"/>
    41             </exec>
    42             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    43                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
    44             </exec>
    45 
    46 
    47             <!-- get size of greenstone.jar -->
    48             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls"><arg line="-l greenstone3.jar"/></exec>
    49             <exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    50 
    51             <!-- get size of greenstone-with-java.jar -->
    52             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3-with-java.jar.ls"><arg line="-l greenstone3-with-java.jar"/></exec>
    53             <exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    54 
    55             <!-- get size of java -->
    56             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
    57             <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    58 
    59 
    60             <echo level="info">creating the header file for no java version</echo>
    61             <delete file="wrapper.h"/>
    62             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
    63 
    64             <echo level="info">compile the wrapper program</echo>
    65             <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    66                 <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
    67             </exec>
    68 
    69             <echo level="info">compile libsearch4j</echo>
    70             <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    71                 <arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/>
    72             </exec>
    73 
    74             <echo level="info">link, bundling the files to be bundled</echo>
    75             <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    76                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o"/>
    77             </exec>
    78 
    79 
    80             <echo level="info">creating the header file for bundled java version</echo>
    81             <delete file="wrapper.h"/>
    82             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
    83             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
    84             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
    85 
    86             <echo level="info">recompile the wrapper program</echo>
    87             <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    88                 <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
    89             </exec>
    90 
    91             <echo level="info">relink, bundling the files to be bundled</echo>
    92             <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    93                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone3-with-java.jar.o java.o"/>
    94             </exec>
    95 
     28            <!-- create disk image -->
     29            <exec dir="${basedir}/wrapped-installer" executable="hdiutil"><arg line="create -size ${dmg.size}k -fs HFS+ -volname Greenstone${version} Greenstone${version}.dmg"/></exec>
     30            <!-- mount it -->
     31            <exec executable="hdiutil" dir="${basedir}/wrapped-installer"><arg line="attach Greenstone${version}.dmg"/></exec>
     32            <!-- copy file into it -->
     33            <exec executable="cp" dir="${basedir}/wrapped-installer"><arg line="-r Greenstone${version}.app /Volumes/Greenstone${version}"/></exec>
     34            <!-- unmount it-->
     35            <exec executable="hdiutil" dir="${basedir}/wrapped-installer"><arg line="detach /Volumes/Greenstone${version}"/></exec>
    9636        </if>
    9737    </target>
  • release-kits/mark3/bin/mark3

    r16526 r16655  
    1 function show_help {
    2     echo "lirk3 - the LInux Release Kit for greenstone3"
    3     echo "Helps you to create releases of Greenstone3 from the Repository"
    4     echo
    5     echo "usage: lirk3 [-sim] [-from <target>] [other-args]"
    6     echo "  -sim"
    7     echo "      (shortcut for -Dexecute=false)"
    8     echo "      simulation only, don't actually do anything"
    9     echo
    10     echo "  -from <target>"
    11     echo "      (shortcut for -Dresume.from=<target>)"
    12     echo "      start execution from the target with the given target address"
    13     echo "      first level targets can be referred to by name. E.g., -from compile is the same as -from 1"
    14     echo
    15     echo "  -descend"
    16     echo "      (shortcut for -Dresume.mode=descend)"
    17     echo "      execute only the descendents of the target specified with -from"
    18     echo "      for example, with -from 3 -descend, targets 3.1, 3.2, 3.3 etc. would be executed, but execution
    19     echo "      would stop before target 4
    20     echo
    21     echo "  -cp"
    22     echo "      show the classpath being used by LiRK3"
    23     echo "      (like `ant --diagnostics`)"
    24    
    25 }
     1rk_name="mark3"
     2rk_fullname="Mac Release Kit for Greenstone3"
     3RK_HOME=$MARK3_HOME
     4source $MARK3_HOME/linux/rk
    265
    27 #work out the classpath
    28 CLASSPATH=$JAVA_HOME/lib/tools.jar
    29 for file in $LIRK3_HOME/lib/*.jar; do
    30     CLASSPATH=$CLASSPATH:$file
    31 done
    32 for file in $LIRK3_HOME/packages/ant/lib/*.jar; do
    33     CLASSPATH=$CLASSPATH:$file
    34 done
    35 for file in $LIRK3_HOME/packages/ant-installer/lib/*.jar; do
    36     CLASSPATH=$CLASSPATH:$file
    37 done
    38 CLASSPATH=$CLASSPATH:$LIRK3_HOME/packages/ant-installer/classes
    39 
    40 
    41 #create the command
    42 toexec="$LIRK3_HOME/packages/ant/bin/ant -lib `pwd`/installer/classes -f $LIRK3_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -Dlirk3.home=$LIRK3_HOME"
    43 
    44 #pass on the arguments
    45 while [ "$1" != "" ]; do
    46 
    47     if [ "$1" == "-help" ]; then
    48         show_help
    49         exit
    50 
    51     elif [ "$1" == "-cp" ]; then
    52         echo $CLASSPATH
    53         exit
    54 
    55     elif [ "$1" == "-sim" ]; then
    56         toexec="$toexec -Dexecute=false"
    57         shift
    58 
    59     elif [ "$1" == "-descend" ]; then
    60         toexec="$toexec -Dresume.mode=descend"
    61         shift
    62 
    63     elif [ "$1" == "-from" ]; then
    64 
    65         toexec="$toexec -Dresume.from="
    66         from=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`
    67         toexec=$toexec$from
    68         shift 2
    69 
    70     elif [ "$1" == "-to" ]; then
    71 
    72         toexec="$toexec -Dresume.to="
    73         to=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`
    74         toexec=$toexec$to
    75         shift 2
    76 
    77 
    78     else
    79         toexec="$toexec $1"
    80         shift
    81     fi
    82 
    83 done
    84 
    85 #echo $toexec
    866echo "O---------------------------------------O"
    877echo "|                                       |"
    88 echo "|   LiRK3                               |"
    89 echo "|   Linux Release Kit for Greenstone3   |"
     8echo "|   Mark3                               |"
     9echo "|   Mac Release Kit for Greenstone3     |"
    9010echo "|                                       |"
    9111echo "O---------------------------------------O"
    92 echo "Basedir  : `pwd`"
    9312
    9413$toexec
     14
  • release-kits/mark3/installer/antinstall-config.xml

    r16003 r16655  
    3636
    3737        <target target="install-core-components"    diskRequirement="50Mb"                          defaultValue="true" displayText="" force="true" />
    38         <target target="install-java"               diskRequirement="@component.size.java@" defaultValue="true" displayText="" /> <!-- bundled java only -->
    3938        <target target="install-tomcat"             diskRequirement="@component.size.tomcat@"   defaultValue="true" displayText="" />
    4039        <target target="install-ant"                    diskRequirement="@component.size.ant@"      defaultValue="true" displayText="" />
Note: See TracChangeset for help on using the changeset viewer.