v20201028

diff --git a/install/windows/setup_64bit.iss b/install/windows/setup_64bit.iss
index dd2c3ec..af19ac1 100644 (file)
--- a/install/windows/setup_64bit.iss
+++ b/install/windows/setup_64bit.iss
@@ -1,18 +1,18 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "POT - Plan d'Organisation du Travail"
+#define MyAppName "Invoice Journal"
 #define MyAppVersion "1.0.0"
-#define MyAppPublisher "POT s.à r.l."
-#define MyAppURL "http://pot.dks.lu/"
-#define MyAppExeName "pot.exe"
-#define MyOutputDir "C:\Users\kilian\Workspace\pot_lu\website\downloads"
-#define MySourceDir "C:\Users\kilian\Workspace\pot_lu"
-#define MySetupName "POT_Setup_64bit"
+#define MyAppPublisher "DKS s.à r.l."
+#define MyAppURL "http://www.dks.lu/"
+#define MyAppExeName "invoicejournal.exe"
+#define MyOutputDir "D:\Workspace\invoicejournal\release"
+#define MySourceDir "D:\Workspace\invoicejournal"
+#define MySetupName "InvoiceJournal_Setup_64bit"
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{C583A11C-7811-4C73-B26C-1D61A6F5B679}
+AppId={{23D35E6F-AD7C-406F-8567-04E02271FDE6}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 ;AppVerName={#MyAppName} {#MyAppVersion}
@@ -20,12 +20,12 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={autopf}\POT
+DefaultDirName={autopf}\InvoiceJournal
 DisableProgramGroupPage=yes
 DisableDirPage=yes
 CloseApplications=force
-CloseApplicationsFilter=pot.exe
-LicenseFile={#MySourceDir}\install\CGV.rtf
+CloseApplicationsFilter=invoicejournal.exe
+LicenseFile={#MySourceDir}\install\EULA_default.rtf
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)
 PrivilegesRequired=lowest
 ;PrivilegesRequiredOverridesAllowed=dialog
@@ -35,18 +35,19 @@ SetupIconFile={#MySourceDir}\install\windows\icons\Install-Icon.ico
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
-WizardSmallImageFile=wizpotsmall.bmp
+WizardSmallImageFile=wizsmall.bmp
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
 MinVersion=6.1
 [Languages]
+Name: "german"; MessagesFile: "compiler:Languages\German.isl"
 ;Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-;Name: "german"; MessagesFile: "compiler:Languages\German.isl"
+
 
 [Files]
-Source: "{#MySourceDir}\release-builds\pot-win32-x64\pot.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "{#MySourceDir}\release-builds\pot-win32-x64\*"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
+Source: "{#MySourceDir}\release-builds\invoicejournal-win32-x64\invoicejournal.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
+Source: "{#MySourceDir}\release-builds\invoicejournal-win32-x64\*"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

diff --git a/install/windows/wizside.bmp b/install/windows/wizside.bmp
index 499693b..c5ea3d1 100644 (file)
Binary files a/install/windows/wizside.bmp and b/install/windows/wizside.bmp differ

diff --git a/install/windows/wizsmall.bmp b/install/windows/wizsmall.bmp
index 44d4239..89c06a6 100644 (file)
Binary files a/install/windows/wizsmall.bmp and b/install/windows/wizsmall.bmp differ

diff --git a/install/windows_installer.bat b/install/windows_installer.bat
index 8458c91..46fdaa1 100644 (file)
--- a/install/windows_installer.bat
+++ b/install/windows_installer.bat
@@ -3,12 +3,33 @@ set appname=InvoiceJournal
 set reppath=%~dp0
 cd %~dp0
 cd ..
+echo "%CD%"
 mkdir release
-cd desktopapp
-npm run package-win32
-npm run package-win64
-"C:/Program Files (x86)/Inno Setup 6/ISCC.exe" /DMyAppVersion=1.0.0 /DMySourceDir=%reppath% /DMySetupName=%appname%_Setup_32bit.exe %reppath%/install/windows/setup_32bit.iss
-"C:/Program Files (x86)/Inno Setup 6/ISCC.exe" /DMyAppVersion=1.0.0 /DMyOutputDir=%reppath%/../release /DMySourceDir=%reppath% /DMySetupName=%appname%_Setup_64bit.exe %reppath%/install/windows/setup_64bit.iss
+
+git.exe for-each-ref --sort=-creatordate --format="%(refname)" refs/tags
+set /p id=Enter Tag: 
+echo %tag%
+set currenttag=git.exe for-each-ref --sort=-creatordate --format="%(refname)" refs/tags/%tag%
+IF NOT "%currenttag"=="" (
+  echo "Generate new release tag"
+  git tag %tag% -m "Version %tag%"
+) 
+
+echo "export tag %tag%"
+git.exe archive -o "%reppath%/release/%appname%_%tag%.zip" %tag%
+echo "extract data %appname%_%tag%.zip"
+cd %reppath%/relaese
+C:%HOMEUSER%\Tools\7za.exe x "%reppath%/release/%appname%_%tag%.zip"
+@REM cd %reppath%/relase/desktopapp
+
+@REM xcopy  
+REM npm run package-win32
+rem npm run package-win64
+REM "C:/Program Files (x86)/Inno Setup 6/ISCC.exe" /DMyAppVersion=1.0.0 /DMySourceDir=%reppath% /DMySetupName=%appname%_Setup_32bit.exe %reppath%/install/windows/setup_32bit.iss
+REM "C:/Program Files (x86)/Inno Setup 6/ISCC.exe" -v /DMyAppVersion=1.0.0 /DMyOutputDir=%reppath%/../release /DMySourceDir=%reppath% /DMySetupName=%appname%_Setup_64bit.exe %reppath%/istall/windows/setup_64bit.iss
+
+REM list tags
+REM git.exe for-each-ref --sort=-creatordate --format="%(refname)" refs/tags
 
 rem "C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64/signtool.exe" sign /a /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "C:/Users/kilian/Workspace/pot_lu/website/downloads/%appname%_Setup_64bit.exe"
 rem "C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x86/signtool.exe" sign /a /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "C:/Users/kilian/Workspace/pot_lu/website/downloads/%appname%_Setup_32bit.exe"