2002/04/27 03:40:02

[org.ibex.core.git] / src / org / xwt / plat / Win32.xml

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>