Changeset 19936


Ignore:
Timestamp:
2009-06-26T16:36:47+12:00 (15 years ago)
Author:
oranfry
Message:

changes to wirk3 comparable to the ones just done on lirk3

Location:
release-kits
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • release-kits/lirk3/ant-scripts/compile.xml

    r19935 r19936  
    33
    44    <target name="compile">
    5 
    65        <antcall target="checkout-greenstone3" />
    76        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="compiled"/></antcall>
    … …  
    1918        <antcall target="compile-uninstaller" /> <!-- from rk3-targets -->
    2019        <antcall target="prepare-documentation"/> <!-- from rk3-targets -->
    21 
    22         <!-- tweakers -->
    23         <!--<antcall target="tweak-configure-scripts" />
    24         <antcall target="regenerate-configure"/>
    25         <antcall target="tweak-makefiles" />
    26         <antcall target="linux-strip-execs" />
    27         -->
    28 
    29 
    3020    </target>
    3121
    … …  
    3727    </target>
    3828
    39 
    40 <!--
    41     <target name="ant-prepare">
    42         <ant target="prepare" dir="compiled" inheritAll="false">
    43             <propertyset refid="forward.properties"/>
    44         </ant>
    45     </target>
    46 
    47     <target name="ant-install">
    48         <ant target="install" dir="compiled" inheritAll="false">
    49             <propertyset refid="forward.properties"/>
    50         </ant>
    51     </target>
    52 
    53     <target name="ant-dist-tidy">
    54         <ant target="dist-tidy" dir="compiled" inheritAll="false">
    55             <propertyset refid="forward.properties"/>
    56         </ant>
    57     </target>
    58 -->
    59 
    60     <target name="tweak-configure-scripts">
    61         <antcall target="mgpp-add-static" />
    62         <antcall target="mg-add-static" />
    63         <antcall target="gs2build-add-static" />
    64     </target>
    65 
    66     <target name="regenerate-configure">
    67         <exec dir="compiled/gs2build" executable="autoconf" output="compiled/gs2build/configure">
    68             <arg line="configure.in"/>
    69         </exec>
    70         <chmod file="compiled/gs2build/configure" perm="+x"/>
    71     </target>
    72 
    73     <target name="tweak-makefiles">
    74         <antcall target="wv-add-static" />
    75         <antcall target="xlhtml-add-static" />
    76         <antcall target="ppthtml-add-static" />
    77         <antcall target="rtftohtml-add-static" />
    78         <antcall target="gdbm-add-static" />
    79     </target>
    80 
    81     <target name="linux-strip-execs">
    82         <exec dir="compiled/gs2build/bin/linux" executable="find">
    83             <arg line="! -name . -exec strip {} &#59;"/>
    84         </exec>
    85     </target>
    86 
    87 
    88     <!--
    89 
    90         third level targets
    91 
    92     -->
    93 
    94     <target name="mgpp-add-static">
    95         <rsr file="compiled/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
    96         <exec dir="compiled/gs2build/common-src/indexers/mgpp" executable="autoconf" output="compiled/gs2build/common-src/indexers/mgpp/configure">
    97             <arg line="configure.in"/>
    98         </exec>
    99     </target>
    100 
    101     <target name="mg-add-static">
    102         <rsr file="compiled/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
    103         <exec dir="compiled/gs2build/common-src/indexers/mg" executable="autoconf" output="compiled/gs2build/common-src/indexers/mg/configure">
    104             <arg line="configure.in"/>
    105         </exec>
    106     </target>
    107 
    108     <target name="gs2build-add-static">
    109         <rsr file="compiled/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
    110         <rsr file="compiled/gs2build/build-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
    111         <rsr file="compiled/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />
    112     </target>
    113 
    114     <target name="wv-add-static">
    115         <rsr file="compiled/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    116     </target>
    117 
    118     <target name="xlhtml-add-static">
    119         <rsr file="compiled/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    120     </target>
    121 
    122     <target name="ppthtml-add-static">
    123         <rsr file="compiled/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    124     </target>
    125 
    126     <target name="rtftohtml-add-static">
    127         <rsr file="compiled/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
    128     </target>
    129 
    130     <target name="gdbm-add-static">
    131         <rsr file="compiled/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" />
    132     </target>
    133 
    134 
    13529</project>

  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r19935 r19936  
    1111    </target>
    1212
    13     <target name="clean-user-manual">
    14         <copy file="distributions/web/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/>
    15         <delete dir="distributions/web/gsdl-manuals"/>
    16     </target>
    17 
    18     <target name="clean-uninstaller">
    19         <delete dir="distributions/web/uninstaller"/>
    20     </target>
    21 
    2213</project>

  • release-kits/mark3/ant-scripts/compile.xml

    r19935 r19936  
    1111            <param name="greenstone3basedir" value="${basedir}/compiled"/>
    1212        </antcall>
    13         <antcall target="set-gdbm-installed-path" />
    1413        <ant target="prepare-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
    1514       
    … …  
    3736    </target>
    3837
    39     <target name="set-gdbm-installed-path">
    40         <if>
    41             <bool><not><available file="compiled/build.properties"/></not></bool>
    42             <copy file="compiled/build.properties.in" tofile="compiled/build.properties"/>
    43         </if>
    44         <rsr file="compiled/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/>
    45     </target>
    46 
    47     <target name="tweak-makefiles">
    48         <rsr
    49             file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/db2txt/Makefile"
    50             pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
    51             replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
    52 
    53         <rsr
    54             file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/txt2db/Makefile"
    55             pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
    56             replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
    57 
    58         <rsr
    59             file="${basedir}/compiled/src/packages/javagdbm/jni/Makefile"
    60             pattern="^(GDBM_LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
    61             replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
    62     </target>
    6338
    6439    <target name="linux-strip-execs">
    … …  
    6843    </target>
    6944
    70     <target name="prepare-documentation">
    71         <mkdir dir="compiled/gsdl-manuals"/>
    72         <svn>
    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         </svn>
    76         <javac
    77                 srcdir="compiled/gsdl-manuals/shared"
    78                 destdir="compiled/gsdl-manuals/shared"
    79                 debug="on">
    80             <include name="*.java"/>
    81         </javac>
    82         <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
    83 
    84         <path id="documentation.compile.classpath">
    85             <fileset dir="compiled/gsdl-manuals">
    86                 <include name="**/*.jar"/>
    87             </fileset>
    88             <pathelement path="compiled/gsdl-manuals/shared"/>
    89             <pathelement path="compiled/gsdl-manuals/manuals"/>
    90         </path>
    91 
    92         <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml">
    93             <arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
    94             <arg value="compiled/gli/help/en/help.xml" />
    95             <arg value="compiled" />
    96         </java>
    97 
    98         <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/>
    99         <echo>Run generate-pdf.sh</echo>
    100         <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh">
    101             <arg line="generate-pdf.sh u en" />
    102         </exec>
    103     </target>
    104 
    10545</project>
    10646

  • release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

    r19935 r19936  
    187187
    188188    </target>
     189
     190    <target name="clean-user-manual">
     191        <copy file="distributions/web/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/>
     192        <delete dir="distributions/web/gsdl-manuals"/>
     193    </target>
     194
     195    <target name="clean-uninstaller">
     196        <delete dir="distributions/web/uninstaller"/>
     197    </target>
     198
    189199   
    190200</project>

  • release-kits/wirk3/ant-scripts/compile.xml

    r19935 r19936  
    44    <target name="compile">
    55        <antcall target="checkout-greenstone3" />
    6         <antcall target="generate-build-properties"><param name="greenstone3.basedir" value="compiled"/></antcall>
    7         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/compiled" /></antcall>
    8 
    9         <ant target="prepare" dir="compiled" inheritAll="false">
    10             <property name="app.version" value="${version}"/>
    11             <property name="branch.path" value="${branch.path}"/>
    12             <property name="branch.revision" value="${branch.revision}"/>
     6        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="compiled" /></antcall>
     7        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="compiled/gli" /></antcall>
     8        <ant dir="compiled" inheritAll="false">
     9            <target name="prepare"/>
     10            <target name="install"/>
     11            <target name="dist-tidy"/>
     12            <propertyset refid="forward.properties"/>
    1313        </ant>
    14 
    1514        <antcall target="insert-windows-perl"><param name="todir" value="compiled/gs2build/bin/windows"/></antcall>
    16 
    17         <ant target="install" dir="compiled" inheritAll="false">
    18             <property name="app.version" value="${version}"/>
    19             <property name="branch.path" value="${branch.path}"/>
    20             <property name="branch.revision" value="${branch.revision}"/>
    21         </ant>
    22 
    23         <antcall target="compile-uninstaller"/> <!-- from rk3-targets -->
     15        <antcall target="insert-xml-parser"/>
     16        <antcall target="insert-ant"/>
     17        <antcall target="insert-documented-examples"/>
     18        <antcall target="compile-uninstaller" /> <!-- from rk3-targets -->
    2419        <antcall target="prepare-documentation"/> <!-- from rk3-targets -->
     20        <antcall target="insert-icon"/>
    2521    </target>
    2622   
     23    <target name="insert-icon">
     24        <copy
     25            file="${wirk3.home}/greenstone3/icon/icon.ico"
     26            tofile="compiled/resources/images/gs3.ico"/>
     27    </target>
     28
     29   
    2730</project>

  • release-kits/wirk3/ant-scripts/create-components.xml

    r19413 r19936  
    1818        <antcall target="prepare-tomcat-component" />
    1919
    20         <antcall target="prepare-sourcecode-component" />
    21 
    2220    </target>
    2321   
    … …  
    2826        <antcall target="compress-ant-component" />
    2927        <antcall target="compress-tomcat-component" />
    30 
    31         <antcall target="compress-zipped-binary-release"><param name="format" value="zip"/></antcall> <!-- from init -->
    32 
    3328    </target>
    3429   

  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r19935 r19936  
    33
    44    <target name="create-distribution">
    5 
    65        <!-- create distribution -->
    7         <antcall target="export-greenstone3-gli" />
    8         <antcall target="generate-build-properties"><param name="greenstone3.basedir" value="distributions/web"/></antcall>
    9         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web" /></antcall>
    10         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli" /></antcall>
    11         <antcall target="insert-user-manual"/>
    12         <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets -->
    13 
    14         <ant target="create-distribution-1" dir="distributions/web" inheritAll="false">
    15             <property name="app.version" value="${version}"/>
    16             <property name="branch.path" value="${branch.path}"/>
    17             <property name="branch.revision" value="${branch.revision}"/>
    18         </ant>
    19 
    20         <antcall target="insert-icon"/>
    21 
    22         <ant target="create-distribution-2" dir="distributions/web" inheritAll="false">
    23             <property name="app.version" value="${version}"/>
    24             <property name="branch.path" value="${branch.path}"/>
    25             <property name="branch.revision" value="${branch.revision}"/>
    26         </ant>
    27         <ant target="create-distribution-3" dir="distributions/web" inheritAll="false">
    28             <property name="app.version" value="${version}"/>
    29             <property name="branch.path" value="${branch.path}"/>
    30             <property name="branch.revision" value="${branch.revision}"/>
    31         </ant>
    32         <antcall target="copy-over-build-xml" />
    33         <antcall target="insert-compiled-binaries"/>
    34 
    35     </target>
    36 
    37     <target name="export-greenstone3-gli">
    38         <mkdir dir="distributions"/>
    39         <delete dir="distributions/web"/>
    40         <svn>
    41             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web" revision="${branch.revision}"/>
    42             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli" revision="${branch.revision}"/>
    43         </svn>
    44     </target>
    45 
    46     <target name="copy-over-build-xml">
    47         <if><bool><istrue value="${execute}"/></bool>
    48             <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/>
    49         </if>
    50     </target>
    51 
    52     <target name="insert-user-manual">
    53         <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/>
    54     </target>
    55 
    56     <target name="insert-compiled-binaries">
    57 
    58         <delete dir="distributions/web/lib/jni"/>
    59         <copy todir="distributions/web/lib/jni"><fileset dir="compiled/lib/jni"/></copy>
    60        
    61         <delete dir="distributions/web/gs2build/bin/windows"/>
    62         <copy todir="distributions/web/gs2build/bin/windows"><fileset dir="compiled/gs2build/bin/windows"/></copy>
    63 
    64         <delete dir="distributions/web/gs2build/bin/java"/>
    65         <copy todir="distributions/web/gs2build/bin/java"><fileset dir="compiled/gs2build/bin/java"/></copy>
    66 
    67         <copy todir="distributions/web/bin" file="compiled/bin/search4j.exe"/>
    68     </target>
    69    
    70     <target name="insert-icon">
    71         <copy
    72             file="${wirk3.home}/greenstone3/icon/icon.ico"
    73             tofile="distributions/web/resources/images/gs3.ico"/>
     6        <antcall target="copy-compiled-to-dist"/> <!-- from init -->
     7        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from init -->
     8        <antcall target="clean-user-manual"/>
     9        <antcall target="clean-uninstaller"/>
     10        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init -->
    7411    </target>
    7512
Note: See TracChangeset for help on using the changeset viewer.