Mercurial > hg > tony

changeset 631:22724d007706 v2.1pre1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove 32-bit Windows package for simpler maintenance
author Chris Cannam
date Thu, 10 Oct 2019 14:56:47 +0100
parents e77c6e2f6453
children 586f285296b8
files deploy/win32/License.rtf deploy/win32/build-32.bat deploy/win32/tony.wxs deploy/win64/build-and-package.bat
diffstat 4 files changed, 2 insertions(+), 318 deletions(-) [+]
line wrap: on
line diff
Binary file deploy/win32/License.rtf has changed
--- a/deploy/win32/build-32.bat	Thu Oct 10 14:54:10 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-rem  Run this from within the top-level Tony dir: deploy\win32\build-32.bat
-rem  To build from clean, delete the folder build_win32
-
-set STARTPWD=%CD%
-
-set QTDIR=C:\Qt\5.11.3\mingw53_32
-if not exist %QTDIR% (
-@   echo Could not find 32-bit Qt
-@   exit /b 2
-)
-
-set ORIGINALPATH=%PATH%
-set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin;C:\Qt\Tools\QtCreator\bin;C:\Qt\Tools\mingw530_32\bin
-
-cd %STARTPWD%
-
-call .\repoint install
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-mkdir build_win32
-cd build_win32
-
-qmake -spec win32-g++ -r ..\tony.pro
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-mingw32-make
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-copy %QTDIR%\bin\Qt5Core.dll .\release
-copy %QTDIR%\bin\Qt5Gui.dll .\release
-copy %QTDIR%\bin\Qt5Widgets.dll .\release
-copy %QTDIR%\bin\Qt5Network.dll .\release
-copy %QTDIR%\bin\Qt5Xml.dll .\release
-copy %QTDIR%\bin\Qt5Svg.dll .\release
-copy %QTDIR%\bin\Qt5Test.dll .\release
-copy %QTDIR%\bin\libgcc_s_dw2-1.dll .\release
-copy %QTDIR%\bin\"libstdc++-6.dll" .\release
-copy %QTDIR%\bin\libwinpthread-1.dll .\release
-copy %QTDIR%\plugins\platforms\qminimal.dll .\release
-copy %QTDIR%\plugins\platforms\qwindows.dll .\release
-copy %QTDIR%\plugins\styles\qwindowsvistastyle.dll .\release
-
-rem some of these expect to be run from the project root
-cd ..
-build_win32\release\test-svcore-base
-if %errorlevel% neq 0 exit /b %errorlevel%
-build_win32\release\test-svcore-system
-if %errorlevel% neq 0 exit /b %errorlevel%
-build_win32\release\test-svcore-data-fileio --testdir svcore/data/fileio/test
-if %errorlevel% neq 0 exit /b %errorlevel%
-build_win32\release\test-svcore-data-model
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-set PATH=%ORIGINALPATH%
--- a/deploy/win32/tony.wxs	Thu Oct 10 14:54:10 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,234 +0,0 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-
-  <Product
-      Name="Tony" 
-      Id="*"
-      Language="1033"
-      Codepage="1252" 
-      Version="2.0"
-      UpgradeCode="3F073027-A65B-4688-906C-5F64597C5BB1"
-      Manufacturer="Queen Mary, University of London">
-    
-    <Package
-        Id="*"
-        Keywords="Installer"
-        Description="Tony Installer" 
-        Comments="Copyright (c) 2015 Queen Mary, University of London and others."
-        Manufacturer="Queen Mary, University of London" 
-        InstallerVersion="100" 
-        Languages="1033" 
-        Compressed="yes" 
-        SummaryCodepage="1252"/>
-
-    <MajorUpgrade DowngradeErrorMessage="A later version of Tony is already installed. Setup will now exit."/>
-
-    <Media Id="1" Cabinet="Tony.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/>
-    <Property Id="DiskPrompt" Value="Tony Installation [1]"/>
-
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder" Name="PFiles">
-
-        <Directory Id="APPLICATIONFOLDER" Name="Tony">
-
-          <Component
-              Id="MainExecutable"
-              Guid="B0DA872A-E8B9-4C41-B0B0-7702A9EBBD51">
-
-            <File
-                Id="T"
-                Name="Tony.exe"
-                DiskId="1"
-                Source="release\Tony.exe"
-                KeyPath="yes">
-
-              <Shortcut
-                  Id="TStartEntry"
-                  Directory="ProgramMenuDir"
-                  Name="Tony"
-		  Icon="winicon.ico"
-		  IconIndex="0"
-                  WorkingDirectory="INSTALLDIR"
-                  Advertise="yes"/>
-	      
-              <Shortcut
-                  Id="TDesktop"
-                  Directory="DesktopFolder"
-                  Name="Tony"
-		  Icon="winicon.ico"
-		  IconIndex="0"
-                  WorkingDirectory="INSTALLDIR"
-                  Advertise="yes"/>
-            </File>
-
-            <File
-                Id="CHANGELOG"
-                Name="CHANGELOG.txt"
-                DiskId="1"
-                Source="..\CHANGELOG"/>
-            <File
-                Id="COPYING"
-                Name="COPYING.txt"
-                DiskId="1"
-                Source="..\COPYING"/>
-            <File
-                Id="README"
-                Name="README.txt"
-                DiskId="1"
-                Source="..\README.md"/>
-            <File
-                Id="CITATION"
-                Name="CITATION.txt"
-                DiskId="1"
-                Source="..\CITATION"/>
-
-            <File
-                Id="winicon.ico"
-                Name="tony-winicon.ico"
-                DiskId="1"
-                Source="..\icons\tony-winicon.ico"/>
-          </Component>
-            
-          <Component
-              Id="pYin"
-              Guid="5C3B7285-B652-4FE5-8A1D-AC92376F8AD5">
-            <File
-                Id="pyinlib"
-                Name="pyin.dll"
-                DiskId="1"
-                Source="release\pyin.dll"/>
-            <File
-                Id="pyincat"
-                Name="pyin.cat"
-                DiskId="1"
-                Source="..\pyin\pyin.cat"/>
-            <File
-                Id="pyinrdf"
-                Name="pyin.n3"
-                DiskId="1"
-                Source="..\pyin\pyin.n3"/>
-          </Component>
-          <Component
-              Id="CHP"
-              Guid="3567639C-BFA5-46EC-BA2D-C4899508B0D0">
-            <File
-                Id="chplib"
-                Name="chp.dll"
-                DiskId="1"
-                Source="release\chp.dll"/>
-          </Component>
-
-          <Component
-              Id="Qt5"
-              Guid="7DCE15D9-DB56-4ECC-A324-A9B74E30B872">
-            <File
-                Id="QtCore"
-                Name="Qt5Core.dll"
-                DiskId="1"
-                Source="release\Qt5Core.dll"
-		KeyPath="yes"/>
-            <File
-                Id="QtGui"
-                Name="Qt5Gui.dll"
-                DiskId="1"
-                Source="release\Qt5Gui.dll"/>
-            <File
-                Id="QtNetwork"
-                Name="Qt5Network.dll"
-                DiskId="1"
-                Source="release\Qt5Network.dll"/>
-            <File
-                Id="QtSvg"
-                Name="Qt5Svg.dll"
-                DiskId="1"
-                Source="release\Qt5Svg.dll"/>
-            <File
-                Id="QtWidgets"
-                Name="Qt5Widgets.dll"
-                DiskId="1"
-                Source="release\Qt5Widgets.dll"/>
-            <File
-                Id="QtXml"
-                Name="Qt5Xml.dll"
-                DiskId="1"
-                Source="release\Qt5Xml.dll"/>
-            <File
-                Id="libgcc"
-                Name="libgcc_s_dw2-1.dll"
-                DiskId="1"
-                Source="release\libgcc_s_dw2-1.dll"/>
-            <File
-                Id="libstdcplusplus"
-                Name="libstdc++-6.dll"
-                DiskId="1"
-                Source="release\libstdc++-6.dll"/>
-            <File
-                Id="libwinpthread"
-                Name="libwinpthread-1.dll"
-                DiskId="1"
-                Source="release\libwinpthread-1.dll"/>
-          </Component>
-	    
-	  <Directory Id="Platforms" Name="platforms">
-            <Component
-                Id="Qt5PlatformPlugins"
-                Guid="F3AAECAE-3B5E-4BA7-8F17-D20F608BE43A">
-	      <File
-                  Id="qminimal"
-                  Name="qminimal.dll"
-                  DiskId="1"
-                  Source="release\qminimal.dll"/>
-	      <File
-                  Id="qwindows"
-                  Name="qwindows.dll"
-                  DiskId="1"
-                  Source="release\qwindows.dll"/>
-            </Component>
-	  </Directory>
-        </Directory>
-	
-      </Directory>
-      
-      <Directory Id="ProgramMenuFolder" Name="Programs">
-        <Directory Id="ProgramMenuDir" Name="Tony">
-          <Component Id="ProgramMenuDir" Guid="56B6BB05-453C-4480-81DA-31612ED64410">
-            <RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
-            <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes"/>
-          </Component>
-        </Directory>
-      </Directory>
-
-      <Directory Id="DesktopFolder" Name="Desktop"/>
-
-    </Directory>
-
-    <Feature 
-      Id="Complete"
-      Title="Required files"
-      Description="Installs the required files for running Tony."
-      AllowAdvertise="no"
-      Absent="disallow"
-      ConfigurableDirectory="APPLICATIONFOLDER"
-      Level="1">
-      <ComponentRef Id="pYin"/>
-      <ComponentRef Id="CHP"/>
-      <ComponentRef Id="MainExecutable"/>
-      <ComponentRef Id="Qt5"/>
-      <ComponentRef Id="Qt5PlatformPlugins"/>
-      <ComponentRef Id="ProgramMenuDir"/>
-    </Feature>
-
-    <UI>
-      <UIRef Id="WixUI_InstallDir" />
-      <UIRef Id="WixUI_ErrorProgressText" />
-    </UI>
-		
-    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
-    <Property Id="ApplicationFolderName" Value="Tony" />
-    <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
-    <WixVariable Id="WixUILicenseRtf" Value="..\deploy\win32\License.rtf" />
-    
-    <Icon Id="winicon.ico" SourceFile="..\icons\tony-winicon.ico"/>
-    <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
-        
-  </Product>
-</Wix>
--- a/deploy/win64/build-and-package.bat	Thu Oct 10 14:54:10 2019 +0100
+++ b/deploy/win64/build-and-package.bat	Thu Oct 10 14:56:47 2019 +0100
@@ -34,19 +34,7 @@
 )
 
 @echo ""
-@echo Rebuilding 32-bit
-
-cd %STARTPWD%
-del /q /s build_win32
-call .\deploy\win32\build-32.bat
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-if "%ARG%" == "sign" (
-@echo Signing 32-bit executables and libraries
-signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 build_win32\release\*.exe build_win32\release\*.dll
-)
-
-@echo Rebuilding 64-bit
+@echo Rebuilding 
 
 cd %STARTPWD%
 del /q /s build_win64
@@ -60,23 +48,7 @@
 
 set PATH=%PATH%;"C:\Program Files (x86)\WiX Toolset v3.11\bin"
 
-@echo Packaging 32-bit
-
-cd %STARTPWD%\build_win32
-del tony.msi
-candle -v ..\deploy\win32\tony.wxs
-light -b . -ext WixUIExtension -ext WixUtilExtension -v tony.wixobj
-if %errorlevel% neq 0 exit /b %errorlevel%
-del tony.wixobj
-del tony.wixpdb
-
-if "%ARG%" == "sign" (
-@echo Signing 32-bit package
-signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 tony.msi
-signtool verify /pa tony.msi
-)
-
-@echo Packaging 64-bit
+@echo Packaging 
 
 cd %STARTPWD%\build_win64
 del tony.msi