2002/04/27 03:40:02

darcs-hash:20040130064524-2ba56-25b522d4a9b69924163602b6aa8a9b1d217c5ef5.gz

diff --git a/src/org/xwt/plat/GCJ.xml b/src/org/xwt/plat/GCJ.xml
index b3ea01a..30d0d33 100644 (file)
--- a/src/org/xwt/plat/GCJ.xml
+++ b/src/org/xwt/plat/GCJ.xml
@@ -54,7 +54,7 @@
             <mapper type='glob' from='*.cc' to='*-nat.o'/>
         </apply>
                                                                               
-        <echo message='linking        .o -> ${binaryname}'/>
+                                                                                      <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'/>

diff --git a/src/org/xwt/plat/Java2.xml b/src/org/xwt/plat/Java2.xml
index 2af97c6..c1b78df 100644 (file)
--- a/src/org/xwt/plat/Java2.xml
+++ b/src/org/xwt/plat/Java2.xml
@@ -17,8 +17,10 @@
     </target>
 
     <target name="dist">
-        <jar update="true" jarfile='www/html/dist/xwt.jar' basedir='bin/' includes=''>
-            <patternset>
+        <echo message="creating jar source area in bin-Java2/"/>
+        <mkdir dir="bin-Java2"/>
+        <copy todir="bin-Java2">
+            <fileset dir="bin/">
                 <include name='org/xwt/*.class'/>
                 <include name='org/xwt/util/*.class'/>
                 <include name='org/mozilla/**/*.class'/>
@@ -27,7 +29,7 @@
                 <include name='org/xwt/plat/AWT*.class'/>
                 <include name='org/xwt/plat/Java2*.class'/>
                 <include name='org/xwt/plat/MacOSX*.class'/>
-            </patternset>
-        </jar>
+            </fileset>
+        </copy>
     </target>
 

diff --git a/src/org/xwt/plat/Java2.xml.orig b/src/org/xwt/plat/Java2.xml.orig
new file mode 100644 (file)
index 0000000..2af97c6
--- /dev/null
+++ b/src/org/xwt/plat/Java2.xml.orig
@@ -0,0 +1,33 @@
+<!-- Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL] -->
+
+<project name="Java2" default="run" basedir=".">
+
+    <target name="build"/>
+
+    <target name="run">
+        <java classname='org.xwt.Main'>
+            <classpath>
+                <pathelement path='bin/'/>
+                <fileset dir='lib'>
+                    <include name='**/*.jar'/>
+                </fileset>
+            </classpath>
+            <arg line='src org.xwt.demo.main'/>
+        </java>
+    </target>
+
+    <target name="dist">
+        <jar update="true" jarfile='www/html/dist/xwt.jar' basedir='bin/' includes=''>
+            <patternset>
+                <include name='org/xwt/*.class'/>
+                <include name='org/xwt/util/*.class'/>
+                <include name='org/mozilla/**/*.class'/>
+                <include name='org/bouncycastle/**/*.class'/>
+                <include name='jazz/**/*.class'/>
+                <include name='org/xwt/plat/AWT*.class'/>
+                <include name='org/xwt/plat/Java2*.class'/>
+                <include name='org/xwt/plat/MacOSX*.class'/>
+            </patternset>
+        </jar>
+    </target>
+

diff --git a/src/org/xwt/plat/Win32.xml b/src/org/xwt/plat/Win32.xml
index ee301d8..bcd65c6 100644 (file)
--- a/src/org/xwt/plat/Win32.xml
+++ b/src/org/xwt/plat/Win32.xml
@@ -19,30 +19,25 @@
 
     <target name="dist">
         <echo message='creating ActiveX dll...'/>
+        <mkdir dir='bin-Win32/cabsrc/'/>
         <bash>
             /usr/local/gcc/bin/i686-pc-mingw32-g++     -DCOMPILE_DLL -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/xwt.dll bin-Win32/Win32-dll.o -lole32 -luuid
+                                                       -o bin-Win32/cabsrc/xwt.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/xwt.dll bin-Win32/Win32-dll.o -lole32 -luuid
+                                                       -Wl,-e,_DllMainCRTStartup@12 -o bin-Win32/cabsrc/xwt.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/xwt.dll \
+            /usr/local/gcc/bin/i686-pc-mingw32-g++     bin-Win32/xwt.exp -mdll -Wl,-e,_DllMainCRTStartup@12 -o bin-Win32/cabsrc/xwt.dll \
                                                        bin-Win32/Win32-dll.o -lole32 -luuid
         </bash>
 
-        <echo message='collecting files to archive in a cab...'/>
-        <copy file='src/org/xwt/plat/Win32.inf' tofile='bin-Win32/xwt.inf'/>
-        <copy file='www/html/dist/xwt.exe' tofile='bin-Win32/xwt.exe'/>
-        <bash> /usr/local/gcc/bin/i686-pc-mingw32-strip bin-Win32/xwt.exe </bash>
+        <echo message='creating area to be signed in bin-Win32/cabsrc/...'/>
+        <copy file='src/org/xwt/plat/Win32.inf' tofile='bin-Win32/cabsrc/xwt.inf'/>
+        <copy file='www/html/dist/xwt.exe' tofile='bin-Win32/cabsrc/xwt.exe'/>
+        <bash> /usr/local/gcc/bin/i686-pc-mingw32-strip bin-Win32/cabsrc/xwt.exe </bash>
 
-        <echo message='building cab file...'/>
-        <exec dir='.' executable='/usr/bin/ssh'>
-           <arg value='${cygwin-host}'/>
-           <arg value='cd ${cygwin-path}/bin-Win32; ../lib/cabarc.exe -s 6144 N xwt.cab xwt.dll xwt.exe xwt.inf'/>
-        </exec>
-        <copy file='bin-Win32/xwt.cab' tofile='www/html/dist/xwt.cab'/>
     </target>
 
 </project>