From 2983c4daf2cbd7869e941f1aad405f958d2cada9 Mon Sep 17 00:00:00 2001 From: Adib Taraben Date: Mon, 26 Nov 2012 00:09:19 +0100 Subject: wix installer: added artwork (from nsis) - now needs wix 3.7 (bzr r11897) --- packaging/wix/Bitmaps/banner.bmp | Bin 0 -> 85894 bytes packaging/wix/Bitmaps/banner.svg | 532 +++++++ packaging/wix/Bitmaps/dialog.bmp | Bin 0 -> 461814 bytes packaging/wix/Bitmaps/dialog.svg | 2918 ++++++++++++++++++++++++++++++++++++++ packaging/wix/README | 3 +- packaging/wix/inkscape.wxs | 15 +- packaging/wix/wixenv.bat | 17 +- 7 files changed, 3477 insertions(+), 8 deletions(-) create mode 100644 packaging/wix/Bitmaps/banner.bmp create mode 100644 packaging/wix/Bitmaps/banner.svg create mode 100644 packaging/wix/Bitmaps/dialog.bmp create mode 100644 packaging/wix/Bitmaps/dialog.svg diff --git a/packaging/wix/Bitmaps/banner.bmp b/packaging/wix/Bitmaps/banner.bmp new file mode 100644 index 000000000..cc05de072 Binary files /dev/null and b/packaging/wix/Bitmaps/banner.bmp differ diff --git a/packaging/wix/Bitmaps/banner.svg b/packaging/wix/Bitmaps/banner.svg new file mode 100644 index 000000000..df0d0df8f --- /dev/null +++ b/packaging/wix/Bitmaps/banner.svg @@ -0,0 +1,532 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/wix/Bitmaps/dialog.bmp b/packaging/wix/Bitmaps/dialog.bmp new file mode 100644 index 000000000..0e015ceb9 Binary files /dev/null and b/packaging/wix/Bitmaps/dialog.bmp differ diff --git a/packaging/wix/Bitmaps/dialog.svg b/packaging/wix/Bitmaps/dialog.svg new file mode 100644 index 000000000..e03cbb46d --- /dev/null +++ b/packaging/wix/Bitmaps/dialog.svg @@ -0,0 +1,2918 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/wix/README b/packaging/wix/README index 2046797ca..f40e104e7 100644 --- a/packaging/wix/README +++ b/packaging/wix/README @@ -3,7 +3,7 @@ howto create windows msi installer you need: 1. windows installer XML installed and callable from your path get it from http://wixtoolset.org/ - the installer is tested using version 3.6 + Because of a bug in the current version of wix the installer works using version 3.7 only. build the installer 1. build inkscape @@ -18,7 +18,6 @@ when completed there should be inkscape.msi in your path things still todo - detailed explanation what to do for new revisions -- include some inkscapeish artwork - better filenames (nightly builds versus releases) - howto remove python .pyc files after deinstallation - localisation into the installer diff --git a/packaging/wix/inkscape.wxs b/packaging/wix/inkscape.wxs index e2bc26462..6e99c2175 100644 --- a/packaging/wix/inkscape.wxs +++ b/packaging/wix/inkscape.wxs @@ -26,7 +26,8 @@ - + + @@ -38,11 +39,10 @@ - + @@ -91,11 +91,16 @@ --> + + + + + - - + + diff --git a/packaging/wix/wixenv.bat b/packaging/wix/wixenv.bat index 85db740df..5f1f7e90c 100644 --- a/packaging/wix/wixenv.bat +++ b/packaging/wix/wixenv.bat @@ -1,4 +1,19 @@ @echo Setting environment variables for creating msi installer + +@echo detect OS version +ver | findstr /i "6\.1\." > nul +IF %ERRORLEVEL% EQU 0 goto win7 + +@rem all other cases +IF "%WIX_PATH%"=="" set WIX_PATH=C:\Programme\WiX Toolset v3.7\bin IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs -IF "%WIX_PATH%"=="" set WIX_PATH=C:\Programme\WiX Toolset v3.6\bin +goto setpath + +:win7 +IF "%WIX_PATH%"=="" set WIX_PATH=C:\Program Files (x86)\WiX Toolset v3.7\bin +IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs + +:setpath set PATH=%DEVLIBS_PATH%\python;%WIX_PATH%;%PATH% + +:end -- cgit v1.2.3