X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.xml;h=aade505674b5244ed924fb819d9b64a4757d4213;hb=c9e1bd707806233eefcaa5497a7a99a95ae3da51;hp=bcd65c6fede2df51ee8dd88837aab82ed30f62b3;hpb=bae6b60e2b3aae0e20ee691f718347cf19e951be;p=org.ibex.core.git
diff --git a/src/org/xwt/plat/Win32.xml b/src/org/xwt/plat/Win32.xml
index bcd65c6..aade505 100644
--- a/src/org/xwt/plat/Win32.xml
+++ b/src/org/xwt/plat/Win32.xml
@@ -13,30 +13,55 @@
-
+
+
- /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++ -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.dll bin-Win32/Win32-dll.o -lole32 -luuid
+ -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.dll bin-Win32/Win32-dll.o -lole32 -luuid
+ /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.dll \
+ /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
-
-
- /usr/local/gcc/bin/i686-pc-mingw32-strip bin-Win32/cabsrc/xwt.exe
+
+
+ cat > bin-Win32/cabsrc/xwt-${build-id}.inf <<\EOF
+;; This file will be copied to bin-Win32/xwt-${build-id}.inf and then packed up
+;; into the .cab file for distribution
+
+[version]
+ signature="$CHICAGO$"
+ AdvancedINF=2.0
+ [Add.Code]
+ xwt-${build-id}.dll=xwt-${build-id}.dll
+ xwt-${build-id}.exe=xwt-${build-id}.exe
+ [xwt-${build-id}.dll]
+ file-win32-x86=thiscab
+ clsid=${clsid-string}
+ FileVersion=7,0,0,0
+ RegisterServer=yes
+ [xwt-${build-id}.exe]
+ file-win32-x86=thiscab
+ clsid={FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFE}
+ FileVersion=7,0,0,0
+ RegisterServer=no
+EOF
+
+
+ /usr/local/gcc/bin/i686-pc-mingw32-strip bin-Win32/cabsrc/xwt-${build-id}.exe