2002/05/16 04:28:23

darcs-hash:20040130064721-2ba56-25d119d7a43671c91ace0aeb75422df6a25b95f1.gz

diff --git a/CHANGES b/CHANGES
index 72779c1..ad1963c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -159,3 +159,6 @@
 
 15-May megacz XMLRPC.java: call() is now synchronized
 
+15-May megacz Win32.xml, GCJ.xml, GCJHTask.java: ${gcc-prefix} now ends
+              with a dash.
+

diff --git a/src/org/xwt/plat/GCJ.xml b/src/org/xwt/plat/GCJ.xml
index 2f4af1d..e8b514b 100644 (file)
--- a/src/org/xwt/plat/GCJ.xml
+++ b/src/org/xwt/plat/GCJ.xml
@@ -21,7 +21,7 @@
         <gcjh out='bin-${plat}' classpath='bin'/>
 
         <echo message='compiling   .java -> .o'/>
-        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}-gcj' dest='bin-${plat}'>
+        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}'>
             <arg value='-fCLASSPATH=${gcc-path}/share/libgcj.jar:src/'/>
             <arg value='-O9'/>
             <arg value='-g'/>
@@ -35,7 +35,7 @@
                 <include name='org/xwt/*.java'/>
                 <include name='org/xwt/util/*.java'/>
                 <include name='org/xwt/plat/GCJ.java'/>
-                <include name='org/xwt/plat/${plat}.java'/>
+                <include name='org/xwt/plat/${subplat}.java'/>
                 <include name='org/bouncycastle/**/*.java'/>
                 <include name='org/mozilla/**/*.java'/>
             </fileset>
@@ -43,19 +43,19 @@
         </apply>
 
         <echo message='compiling     .cc -> .o'/>
-            <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}-gcj' dest='bin-${plat}/'>
+            <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}/'>
             <arg value='-g'/>
             <arg value='-Ibin-${plat}'/>
             <arg value='-c'/>
             <srcfile/>
             <arg value='-o'/>
             <targetfile/>
-            <fileset dir='src/' includes='org/xwt/plat/${plat}.cc'/>
+            <fileset dir='src/' includes='org/xwt/plat/${subplat}.cc'/>
             <mapper type='glob' from='*.cc' to='*-nat.o'/>
         </apply>
                                                                               
-                                                                                      <echo message='linking        .o -> ${binaryname}'/>
-        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}-gcj' parallel='true'>
+        <echo message='linking        .o -> ${binaryname}'/>
+        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' parallel='true'>
             <fileset dir='bin-${plat}/' includes='**/*.o' excludes='*.o'/>
             <arg value='-fCLASSPATH=${gcc-path}/share/libgcj.jar'/>
             <arg value='--main=org.xwt.Main'/>

diff --git a/src/org/xwt/plat/Win32.xml b/src/org/xwt/plat/Win32.xml
index aade505..7b56736 100644 (file)
--- a/src/org/xwt/plat/Win32.xml
+++ b/src/org/xwt/plat/Win32.xml
@@ -3,9 +3,10 @@
 <project name="Win32" default="build">
 
     <target name="build">
-        <property name="gcc-target" value="i686-pc-mingw32"/>
+        <property name="gcc-target" value="i686-pc-mingw32-"/>
         <property name="linkflags" value="-Wl,--subsystem,windows"/>
         <property name="binaryname" value="xwt.exe"/>
+        <property name="subplat" value="Win32"/>
         <ant target="build" antfile="src/org/xwt/plat/GCJ.xml"/>
     </target>
                                                                          
@@ -22,24 +23,25 @@
         <delete dir='bin-Win32/cabsrc/'/>
         <mkdir dir='bin-Win32/cabsrc/'/>
         <bash>
-            /usr/local/gcc/bin/i686-pc-mingw32-g++     -DCOMPILE_DLL -DBUILDID=\"${build-id}\" -DCLSID_STRUCT="${clsid-struct}" \
-                                                       -c src/org/xwt/plat/Win32.cc -o bin-Win32/Win32-dll.o
-            /usr/local/gcc/bin/i686-pc-mingw32-g++     -Wl,--base-file,/tmp/basefile -mdll -Wl,-e,_DllMainCRTStartup@12 \
-                                                       -o bin-Win32/cabsrc/xwt-${build-id}.dll bin-Win32/Win32-dll.o -lole32 -luuid
-            /usr/local/gcc/bin/i686-pc-mingw32-dlltool --base-file /tmp/basefile --output-exp bin-Win32/xwt.exp \
-                                                       --def src/org/xwt/plat/Win32.def
-            /usr/local/gcc/bin/i686-pc-mingw32-g++     -Wl,--base-file,/tmp/basefile bin-Win32/xwt.exp -mdll -Wl,-e,_DllMainCRTStartup@12  \
-                                                       -o bin-Win32/cabsrc/xwt-${build-id}.dll bin-Win32/Win32-dll.o -lole32 -luuid
-            /usr/local/gcc/bin/i686-pc-mingw32-dlltool --base-file /tmp/basefile --output-exp bin-Win32/xwt.exp --def src/org/xwt/plat/Win32.def
-            /usr/local/gcc/bin/i686-pc-mingw32-g++     bin-Win32/xwt.exp -mdll -Wl,-e,_DllMainCRTStartup@12 -o bin-Win32/cabsrc/xwt-${build-id}.dll \
-                                                       bin-Win32/Win32-dll.o -lole32 -luuid
+            ${gcc-path}/bin/i686-pc-mingw32-g++     -DCOMPILE_DLL -DBUILDID=\"${build-id}\" -DCLSID_STRUCT="${clsid-struct}" \
+                                                    -c src/org/xwt/plat/Win32.cc -o bin-Win32/Win32-dll.o
+            ${gcc-path}/bin/i686-pc-mingw32-g++     -Wl,--base-file,/tmp/basefile -mdll -Wl,-e,_DllMainCRTStartup@12 \
+                                                    -o bin-Win32/cabsrc/xwt-${build-id}.dll bin-Win32/Win32-dll.o -lole32 -luuid
+            ${gcc-path}/bin/i686-pc-mingw32-dlltool --base-file /tmp/basefile --output-exp bin-Win32/xwt.exp \
+                                                    --def src/org/xwt/plat/Win32.def
+            ${gcc-path}/bin/i686-pc-mingw32-g++     -Wl,--base-file,/tmp/basefile bin-Win32/xwt.exp -mdll -Wl,-e,_DllMainCRTStartup@12  \
+                                                    -o bin-Win32/cabsrc/xwt-${build-id}.dll bin-Win32/Win32-dll.o -lole32 -luuid
+            ${gcc-path}/bin/i686-pc-mingw32-dlltool --base-file /tmp/basefile --output-exp bin-Win32/xwt.exp --def src/org/xwt/plat/Win32.def
+            ${gcc-path}/bin/i686-pc-mingw32-g++     bin-Win32/xwt.exp -mdll -Wl,-e,_DllMainCRTStartup@12 -o bin-Win32/cabsrc/xwt-${build-id}.dll \
+                                                    bin-Win32/Win32-dll.o -lole32 -luuid
+#            ${gcc-path}/bin/i686-pc-mingw32-strip   bin-Win32/cabsrc/xwt-${build-id}.dll
         </bash>
 
         <echo message='creating area to be signed in bin-Win32/cabsrc/...'/>
 
         <bash>
             cat > bin-Win32/cabsrc/xwt-${build-id}.inf &lt;&lt;\EOF
-;; This file will be copied to bin-Win32/xwt-${build-id}.inf and then packed up
+;; This file will be copied to bin-Win32/cabsrc/xwt-${build-id}.inf and then packed up
 ;; into the .cab file for distribution
 
 [version]
@@ -61,7 +63,7 @@
 EOF
         </bash>
         <copy file='bin-Win32/xwt.exe' tofile='bin-Win32/cabsrc/xwt-${build-id}.exe'/>
-        <bash> /usr/local/gcc/bin/i686-pc-mingw32-strip bin-Win32/cabsrc/xwt-${build-id}.exe </bash>
+        <bash> ${gcc-path}/bin/i686-pc-mingw32-strip bin-Win32/cabsrc/xwt-${build-id}.exe </bash>
 
     </target>