Skip to content

Commit 1ef42b7

Browse files
marek-celmarek-cel
committed
windows installer scripts and input files
1 parent 01169cc commit 1ef42b7

File tree

8 files changed

+75
-78
lines changed

8 files changed

+75
-78
lines changed

‎LICENSE.rtf‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
{\rtf1\ansi\deff3\adeflang1025
2-
{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f4\froman\fprq2\fcharset0 Liberation Sans{\*\falt Arial};}{\f5\froman\fprq2\fcharset0 Times New Roman;}{\f6\fnil\fprq2\fcharset0 Times New Roman;}{\f7\fnil\fprq2\fcharset0 Lohit Devanagari;}{\f8\fnil\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}}
2+
{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f4\froman\fprq2\fcharset0 Liberation Sans{\*\falt Arial};}{\f5\froman\fprq2\fcharset0 Times New Roman;}{\f6\fnil\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f7\fnil\fprq2\fcharset0 Times New Roman;}{\f8\fnil\fprq0\fcharset128 Lohit Devanagari;}}
33
{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
4-
{\stylesheet{\s0\snext0\ql\nowidctlpar\hyphpar0\ltrpar\cf1\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\alang1045\loch\f3\fs24\lang1045 Normal;}
5-
{\s15\sbasedon0\snext16\ql\nowidctlpar\hyphpar0\sb240\sa120\keepn\ltrpar\cf1\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\alang1045\loch\f4\fs28 Nag\u322\'3f\u243\'f3wek;}
6-
{\s16\sbasedon0\snext16\sl276\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf1\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\alang1045\loch\f3\fs24 Tre\u347\'3f\u263\'3f tekstu;}
7-
{\s17\sbasedon16\snext17\sl276\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf1\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\alang1045\loch\f3\fs24 Lista;}
8-
{\s18\sbasedon0\snext18\ql\nowidctlpar\hyphpar0\sb120\sa120\ltrpar\cf1\i\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\alang1045\loch\f3\fs24 Podpis;}
9-
{\s19\sbasedon0\snext19\ql\nowidctlpar\hyphpar0\ltrpar\cf1\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\alang1045\loch\f3\fs24 Indeks;}
10-
}{\*\generator LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3}{\info{\creatim\yr0\mo0\dy0\hr0\min0}{\revtim\yr2020\mo1\dy6\hr12\min49}{\printim\yr0\mo0\dy0\hr0\min0}}{\*\userprops}\deftab720
11-
\hyphauto0\viewscale95
4+
{\stylesheet{\s0\snext0\dbch\af6\langfe1045\dbch\af6\afs24\alang1081\ql\nowidctlpar\hyphpar0\ltrpar\cf1\loch\f3\fs24\lang1045\kerning1 Normal;}
5+
{\s15\sbasedon0\snext16\dbch\af6\langfe1045\dbch\af6\afs24\ql\nowidctlpar\hyphpar0\sb240\sa120\keepn\ltrpar\cf1\loch\f4\fs28\lang1045\kerning1 Nag\u322\'3f\u243\'f3wek;}
6+
{\s16\sbasedon0\snext16\dbch\af6\langfe1045\dbch\af6\afs24\sl276\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf1\loch\f3\fs24\lang1045\kerning1 Tre\u347\'3f\u263\'3f tekstu;}
7+
{\s17\sbasedon16\snext17\dbch\af6\langfe1045\dbch\af6\afs24\sl276\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf1\loch\f3\fs24\lang1045\kerning1 Lista;}
8+
{\s18\sbasedon0\snext18\dbch\af6\langfe1045\dbch\af8\afs24\ai\ql\nowidctlpar\hyphpar0\sb120\sa120\noline\ltrpar\cf1\loch\f3\fs24\lang1045\i\kerning1 Caption;}
9+
{\s19\sbasedon0\snext19\dbch\af6\langfe1045\dbch\af6\afs24\ql\nowidctlpar\hyphpar0\ltrpar\cf1\loch\f3\fs24\lang1045\kerning1 Indeks;}
10+
{\s20\sbasedon0\snext20\dbch\af6\langfe1045\dbch\af6\afs24\ql\nowidctlpar\hyphpar0\sb120\sa120\ltrpar\cf1\loch\f3\fs24\lang1045\i\kerning1 Podpis;}
11+
}{\*\generator LibreOffice/6.4.6.2$Linux_X86_64 LibreOffice_project/40$Build-2}{\info{\creatim\yr0\mo0\dy0\hr0\min0}{\author Marek Cel}{\revtim\yr2021\mo1\dy1\hr19\min26}{\printim\yr0\mo0\dy0\hr0\min0}}{\*\userprops}\deftab720
12+
\hyphauto1\viewscale95
1213
{\*\pgdsctbl
13-
{\pgdsc0\pgdscuse451\pgwsxn12240\pghsxn15840\marglsxn1800\margrsxn1800\margtsxn1440\margbsxn1440\pgdscnxt0 Domy\u347\'3flny;}}
14+
{\pgdsc0\pgdscuse451\pgwsxn12240\pghsxn15840\marglsxn1800\margrsxn1800\margtsxn1440\margbsxn1440\pgdscnxt0 Styl domy\u347\'3flny;}}
1415
\formshade{\*\pgdscno0}\paperh15840\paperw12240\margl1800\margr1800\margt1440\margb1440\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1800\margrsxn1800\margtsxn1440\margbsxn1440\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
15-
{\*\ftnsep\chftnsep}\pgndec\pard\plain \s0\ql\nowidctlpar\hyphpar0\ltrpar\cf1\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\alang1045\loch\f3\fs24\lang1045\sl276\slmult1\sb0\sa140{\cf1\b0\kerning1\dbch\af6\langfe1045\dbch\af6\afs24\alang1045\rtlch \ltrch\loch\fs20\lang1033\loch\f5\hich\af5
16-
Copyright (C) 20}{\cf1\b0\kerning1\dbch\af6\langfe1045\dbch\af6\afs24\alang1045\rtlch \ltrch\loch\fs20\lang1033\loch\f5\hich\af5
17-
20}{\cf1\b0\kerning1\dbch\af6\langfe1045\dbch\af6\afs24\alang1045\rtlch \ltrch\loch\fs20\lang1033\loch\f5\hich\af5
16+
{\*\ftnsep\chftnsep}\pgndec\pard\plain \s0\dbch\af6\langfe1045\dbch\af6\afs24\alang1081\ql\nowidctlpar\hyphpar0\ltrpar\cf1\loch\f3\fs24\lang1045\kerning1\sl276\slmult1\sb0\sa140{\rtlch\dbch\af7\dbch\af7\hich\af5 \ltrch\fs20\lang1033\b0\loch\f5\loch
17+
Copyright (C) 202}{\rtlch\dbch\af7\langfe1045\dbch\af7\afs24\hich\af5 \ltrch\cf1\fs20\lang1033\b0\kerning1\loch\f5\loch
18+
1}{\rtlch\dbch\af7\dbch\af7\hich\af5 \ltrch\fs20\lang1033\b0\loch\f5\loch
1819
Marek M. Cel}
19-
\par \pard\plain \s0\ql\nowidctlpar\hyphpar0\ltrpar\cf1\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\alang1045\loch\f3\fs24\lang1045\sl276\slmult1\sb0\sa140{\cf1\b0\kerning1\dbch\af6\langfe1045\dbch\af6\afs24\alang1045\rtlch \ltrch\loch\fs20\lang1033\loch\f5\hich\af5
20+
\par \pard\plain \s0\dbch\af6\langfe1045\dbch\af6\afs24\alang1081\ql\nowidctlpar\hyphpar0\ltrpar\cf1\loch\f3\fs24\lang1045\kerning1\sl276\slmult1\sb0\sa140{\rtlch\dbch\af7\dbch\af7\hich\af5 \ltrch\fs20\lang1033\b0\loch\f5\loch
2021
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:}
21-
\par \pard\plain \s0\ql\nowidctlpar\hyphpar0\ltrpar\cf1\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\alang1045\loch\f3\fs24\lang1045\sl276\slmult1\sb0\sa140{\cf1\b0\kerning1\dbch\af6\langfe1045\dbch\af6\afs24\alang1045\rtlch \ltrch\loch\fs20\lang1033\loch\f5\hich\af5
22+
\par \pard\plain \s0\dbch\af6\langfe1045\dbch\af6\afs24\alang1081\ql\nowidctlpar\hyphpar0\ltrpar\cf1\loch\f3\fs24\lang1045\kerning1\sl276\slmult1\sb0\sa140{\rtlch\dbch\af7\dbch\af7\hich\af5 \ltrch\fs20\lang1033\b0\loch\f5\loch
2223
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.}
23-
\par \pard\plain \s0\ql\nowidctlpar\hyphpar0\ltrpar\cf1\kerning1\dbch\af7\langfe1081\dbch\af8\afs24\alang1045\loch\f3\fs24\lang1045\sl276\slmult1\ql\sb0\sa140{\cf1\b0\kerning1\dbch\af6\langfe1045\dbch\af6\afs24\alang1045\rtlch \ltrch\loch\fs20\lang1033\loch\f5\hich\af5
24+
\par \pard\plain \s0\dbch\af6\langfe1045\dbch\af6\afs24\alang1081\ql\nowidctlpar\hyphpar0\ltrpar\cf1\loch\f3\fs24\lang1045\kerning1\sl276\slmult1\sb0\sa140{\rtlch\dbch\af7\dbch\af7\hich\af5 \ltrch\fs20\lang1033\b0\loch\f5\loch
2425
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.}
2526
\par }

‎run_qti.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set INSTALLER_NAME=mscsim-0.3-win32
1+
set INSTALLER_NAME=mscsim-0.4-win32
22

33
del %INSTALLER_NAME%.exe
44
del qti\%INSTALLER_NAME%.exe

‎run_wix.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ del qt\bin\mscsim.exe
2424

2525
call "%WIX%bin\heat.exe" dir ".\qt\bin" -gg -ke -sfrag -dr dir_mscsim -cg cg_mscsim_qt -var var.SourceDir -template fragment -out wix_qt.wxs
2626
call "%WIX%bin\heat.exe" dir ".\data" -gg -ke -sfrag -dr dir_mscsim -cg cg_mscsim_data -var var.SourceDir -template fragment -out wix_data.wxs
27-
call "%WIX%bin\heat.exe" dir "%OSG_ROOT%\bin\osgPlugins-3.4.0" -gg -ke -sfrag -dr dir_mscsim_bin -cg cg_mscsim_osg_plugins -var var.SourceDir -template fragment -out wix_osg_plugins.wxs
27+
call "%WIX%bin\heat.exe" dir "%OSG_ROOT%\bin\osgPlugins-3.6.5" -gg -ke -sfrag -dr dir_mscsim_bin -cg cg_mscsim_osg_plugins -var var.SourceDir -template fragment -out wix_osg_plugins.wxs
2828

29-
copy "C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC90_CRT_x86.msm" Microsoft_VC160_CRT_x86.msm
29+
copy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29325\MergeModules\Microsoft_VC142_CRT_x64.msm" Microsoft_VC142_CRT_x64.msm
3030

3131
call "%WIX%bin\candle.exe" -ext WiXUtilExtension wix_alut.wxs
3232
call "%WIX%bin\candle.exe" -ext WiXUtilExtension -dSourceDir=".\data" wix_data.wxs
3333
call "%WIX%bin\candle.exe" -ext WiXUtilExtension wix_main.wxs
3434
call "%WIX%bin\candle.exe" -ext WiXUtilExtension wix_osg.wxs
35-
call "%WIX%bin\candle.exe" -ext WiXUtilExtension -dSourceDir="%OSG_ROOT%\bin\osgPlugins-3.4.0" wix_osg_plugins.wxs
35+
call "%WIX%bin\candle.exe" -ext WiXUtilExtension -dSourceDir="%OSG_ROOT%\bin\osgPlugins-3.6.5" wix_osg_plugins.wxs
3636
call "%WIX%bin\candle.exe" -ext WiXUtilExtension -dSourceDir=".\qt\bin" wix_qt.wxs
37-
call "%WIX%bin\light.exe" -ext WiXUtilExtension -ext WixUIExtension -cultures:en-us -out mscsim-0.3-win64.msi wix_alut.wixobj wix_data.wixobj wix_main.wixobj wix_osg.wixobj wix_osg_plugins.wixobj wix_qt.wixobj
37+
call "%WIX%bin\light.exe" -ext WiXUtilExtension -ext WixUIExtension -cultures:en-us -out mscsim-0.4-win64.msi wix_alut.wixobj wix_data.wixobj wix_main.wixobj wix_osg.wixobj wix_osg_plugins.wixobj wix_qt.wixobj
3838

3939
call run_wix_bundle.bat
4040

‎run_wix_bundle.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
call "%WIX%bin\candle.exe" -ext WixBalExtension wix_bundle.wxs
2-
call "%WIX%bin\light.exe" -ext WixBalExtension -out mscsim-0.3-win64.exe wix_bundle.wixobj
2+
call "%WIX%bin\light.exe" -ext WixBalExtension -out mscsim-0.4-win64.exe wix_bundle.wixobj

‎run_wix_clean.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ del wix_data.wxs
66
del wix_osg_plugins.wxs
77
del wix_qt.wxs
88

9-
del Microsoft_VC90_CRT_x86.msm
9+
del Microsoft_VC142_CRT_x64.msm
1010

1111
del oalinst.exe
1212

13-
del mscsim-0.3-win64.exe
14-
del mscsim-0.3-win64.msi
13+
del mscsim-0.4-win64.exe
14+
del mscsim-0.4-win64.msi
1515

1616
del *.wixobj
1717
del *.wixpdb

‎wix_bundle.wxs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<Bundle
66
Name="MScSim"
7-
Version="0.3"
8-
UpgradeCode="{b3377200-eb13-4ec6-8ec3-646d9686fd2c}">
7+
Version="0.4"
8+
UpgradeCode="{7f01de83-b2ea-4a25-b76e-4703448a36c4}">
99

1010
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
1111
<bal:WixStandardBootstrapperApplication
@@ -17,7 +17,7 @@
1717
<Chain>
1818

1919
<PackageGroupRef Id="OpenAL"/>
20-
<MsiPackage SourceFile="mscsim-0.3-win64.msi" />
20+
<MsiPackage SourceFile="mscsim-0.4-win64.msi" />
2121

2222
</Chain>
2323

‎wix_main.wxs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns="http://schemas.microsoft.com/wix/2006/wi"
44
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
55
<Product
6-
Id="{b3e39794-6324-4e30-88f9-02a84e6b7268}"
6+
Id="{4718e194-d9ee-4a7c-a3a3-03be1aefcb3a}"
77
Name="MScSim"
88
Language="1033"
9-
Version="0.3"
9+
Version="0.4"
1010
Manufacturer="Marek Cel"
11-
UpgradeCode="{a3fab96b-7ed3-4cef-82fc-61a680f82e45}">
11+
UpgradeCode="{1083005b-ce61-4e9a-a31b-8ec58b854b72}">
1212

1313
<Package
1414
Description="MScSim Windows Installer Package"
@@ -28,7 +28,7 @@
2828
<Directory Id="TARGETDIR" Name="SourceDir">
2929

3030
<!-- Visual C++ 2019 Redistributable Merge Module -->
31-
<Merge Id="VCRedist" SourceFile="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.25.28508\MergeModules\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0"/>
31+
<Merge Id="VCRedist" SourceFile="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29325\MergeModules\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0"/>
3232

3333
<!-- installation dir -->
3434
<Directory Id="ProgramFilesFolder" Name="PFiles">
@@ -37,7 +37,7 @@
3737
<Directory Id="dir_mscsim_bin" Name="bin">
3838

3939
<!-- sim.exe -->
40-
<Component Id="dir_mscsim_mscsim" Guid="{e3197461-1aef-4740-a27b-501ee14e66e9}">
40+
<Component Id="dir_mscsim_mscsim" Guid="{be12303b-b379-4402-8639-153d1e81387a}">
4141
<File Id="dir_mscsim_mscsim_exe" Name="mscsim.exe" DiskId="1" Source="bin\mscsim.exe" />
4242
</Component>
4343

@@ -49,7 +49,7 @@
4949
<!-- start menu shortcuts -->
5050
<Directory Id="ProgramMenuFolder">
5151
<Directory Id="ApplicationProgramsFolder" Name="MscSim">
52-
<Component Id="menu_shortcuts" Guid="{161e5841-d82a-4ec8-94d5-248edb1afe1e}">
52+
<Component Id="menu_shortcuts" Guid="{ca4b8fcc-351b-4d90-9230-04f82e55bf81}">
5353
<Shortcut
5454
Id="menu_sim"
5555
Name="MScSim"

0 commit comments

Comments
 (0)