Changeset 16622 for release-kits/lirk3/ant-scripts/compile.xml

Timestamp:

2008-07-31T15:16:45+12:00 (16 years ago)

Author:

oranfry

Message:

changes to lirk3 after gs2build project created in the repository

File:

• release-kits/lirk3/ant-scripts/compile.xml (modified) (6 diffs)

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

@@ -52 +52 @@
         <addressedcall target="mgpp-add-static" />
         <addressedcall target="mg-add-static" />
-        <addressedcall target="gs2buildextra-add-static" />
+        <addressedcall target="gs2build-add-static" />
     </target>
 
@@ -62 +62 @@
 
     <target name="dist-configure-unix">
+
         <if><bool><istrue value="${execute}"/></bool>
-            <exec dir="greenstone3/gs2build/gs2build-extra" executable="autoconf" output="greenstone3/gs2build/configure">
+            <exec dir="greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure">
                 <arg line="configure.in"/>
             </exec>
@@ -69 +70 @@
             <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
         </if>
+
     </target>
 
@@ -144 +146 @@
     <target name="mgpp-add-static">
         <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="greenstone3/gs2build/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
-            <exec dir="greenstone3/gs2build/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/indexers/mgpp/configure">
+            <rsr file="greenstone3/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
+            <exec dir="greenstone3/gs2build/common-src/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mgpp/configure">
                 <arg line="configure.in"/>
             </exec>
@@ -152 +154 @@
     <target name="mg-add-static">
         <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="greenstone3/gs2build/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
-            <exec dir="greenstone3/gs2build/indexers/mg" executable="autoconf" output="greenstone3/gs2build/indexers/mg/configure">
+            <rsr file="greenstone3/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
+            <exec dir="greenstone3/gs2build/common-src/indexers/mg" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mg/configure">
                 <arg line="configure.in"/>
             </exec>
         </if>
     </target>
-    <target name="gs2buildextra-add-static">
+    <target name="gs2build-add-static">
         <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="greenstone3/gs2build/gs2build-extra/packages.configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
-            <rsr file="greenstone3/gs2build/gs2build-extra/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
+            <rsr file="greenstone3/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
+            <rsr file="greenstone3/gs2build/build-src/packages/configure"  pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
+            <rsr file="greenstone3/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />
         </if>
     </target>
@@ -167 +170 @@
     <target name="wv-add-static">
         <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="greenstone3/gs2build/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
+            <rsr file="greenstone3/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
         </if>
     </target>
     <target name="xlhtml-add-static">
         <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="greenstone3/gs2build/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
+            <rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
         </if>
     </target>
     <target name="ppthtml-add-static">
         <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="greenstone3/gs2build/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
+            <rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
         </if>
     </target>
     <target name="rtftohtml-add-static">
         <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="greenstone3/gs2build/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
+            <rsr file="greenstone3/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
         </if>
     </target>