Compile Inno Script Changes

diff --git a/install/create_setup_windows.pl b/install/create_setup_windows.pl
index bdca6c8..0aa3446 100644 (file)
--- a/install/create_setup_windows.pl
+++ b/install/create_setup_windows.pl
@@ -25,23 +25,25 @@ print "Mode:";
 my $ms = <STDIN>;
 chomp($ms);
 $setup = $modes[$ms];
-print "Mode selected:".$modes[$ms]."!\n";
+
+#print "Mode selected:".$modes[$ms]."!\n";
 
 my @tags = split("\n",$strtags);
 my @tex = grep(/^refs\/tags\/$tag$/,@tags);
 #if ($showtags == 1) {
   foreach my $t (reverse(@tags)){
+    $t =~ s/refs\/tags\///;
     print $t."\n";
   }
 
 #  exit(0);
 #}
+print "Select tag:\nTag:";
 $tag = <STDIN>;
 chomp($tag);
 
-print "Compiling Creorga".$setup." version ".$tag."\n";
- 
-exit(0);
+print "Compiling Creorga ".$setup." version ".$tag."\n";
+
 remove_tree("C:\\Users\\ksaff\\Release",{keep_root => 1});
 if (scalar(@tex) > 0) {
   print "Tag $tag exists!\n";
@@ -228,10 +230,10 @@ if (($setup eq "director")){
   make_path("C:\\Users\\ksaff\\Release\\dist\\Tools");
   copy("C:\\Debug\\Creorga\\Tools\\pdftotext.exe","C:\\Users\\ksaff\\Release\\dist\\Tools\\pdftotext.exe");
   #chdir("C:\\Users\\ksaff\\Release\\tag\\tools\\perl");
-  chdir("C:\\Users\\ksaff\\Release\\tag\\app\\Tools");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app\\Tools\\vpnclose.sh");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app\\Tools\\vpnconnect.sh");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app\\Tools\\vpncfg.txt");
+  chdir("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools");
+  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnclose.sh");
+  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnconnect.sh");
+  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpncfg.txt");
   #compile executeables
   system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\creorgadb.exe" -g creorgadb.pl');
   system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\pdfextract.exe" pdfextract.pl');
@@ -242,10 +244,10 @@ if ($setup eq "free"){
   open(CHKS,">C:\\Users\\ksaff\\Release\\dist\\checkschema.txt");
   close(CHKS);
   make_path("C:\\Users\\ksaff\\Release\\dist\\Tools");
-  chdir("C:\\Users\\ksaff\\Release\\tag\\app\\Tools");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app\\Tools\\vpnclose.sh");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app\\Tools\\vpnconnect.sh");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app\\Tools\\vpncfg.txt");
+  chdir("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools");
+  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnclose.sh");
+  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnconnect.sh");
+  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpncfg.txt");
   system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\creorgadb.exe" -g creorgadb.pl');
   #system('"C:\\Program Files (x86)\\ActiveState Perl Dev Kit 9.5.1\\bin\\perlapp.exe" --norunlib --clean --gui --force --info "CompanyName=DKS sarl;FileDescription=Schema Creorga DB Schema;FileVersion=1.0;InternalName=creorgadb.exe;LegalCopyright=2017 DKS sarl;OriginalFilename=creorgadb.exe;ProductName=creorgadb;ProductVersion=1.0" --exe "C:\\Users\\ksaff\\Release\\dist\\Tools\\creorgadb.exe" --perl "C:\\perl\\bin\\perl.exe" "C:\\Users\\ksaff\\Release\\tag\\app\\Tools\\creorgadb.pl"');
 }

diff --git a/install/windows/creorga_setup_director.iss b/install/windows/creorga_setup_director.iss
index 19f0d24..4dd9f6e 100644 (file)
--- a/install/windows/creorga_setup_director.iss
+++ b/install/windows/creorga_setup_director.iss
@@ -25,7 +25,7 @@ DefaultGroupName={#MyAppName}
 LicenseFile=C:\Users\ksaff\Release\tag\License.txt
 OutputDir=C:\Users\ksaff\Release
 OutputBaseFilename=Setup_Creorga_{#MyAppVersion}
-SetupIconFile=C:\Users\ksaff\Release\tag\app\chrome\icons\default\winmain.ico
+SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
 Compression=lzma
 SolidCompression=yes
 WizardImageFile=wizcreorga.bmp

diff --git a/install/windows/creorga_setup_localmanager.iss b/install/windows/creorga_setup_localmanager.iss
index 112b841..a2169cd 100644 (file)
--- a/install/windows/creorga_setup_localmanager.iss
+++ b/install/windows/creorga_setup_localmanager.iss
@@ -25,7 +25,7 @@ DefaultGroupName={#MyAppName}
 LicenseFile=C:\Users\ksaff\Release\tag\License.txt
 OutputDir=C:\Users\ksaff\Release
 OutputBaseFilename=Setup_Creorga_{#MyAppVersion}
-SetupIconFile=C:\Users\ksaff\Release\tag\app\chrome\icons\default\winmain.ico
+SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
 Compression=lzma
 SolidCompression=yes
 WizardImageFile=wizcreorga.bmp

diff --git a/install/windows/creorga_setup_staff.iss b/install/windows/creorga_setup_staff.iss
index 112b841..a2169cd 100644 (file)
--- a/install/windows/creorga_setup_staff.iss
+++ b/install/windows/creorga_setup_staff.iss
@@ -25,7 +25,7 @@ DefaultGroupName={#MyAppName}
 LicenseFile=C:\Users\ksaff\Release\tag\License.txt
 OutputDir=C:\Users\ksaff\Release
 OutputBaseFilename=Setup_Creorga_{#MyAppVersion}
-SetupIconFile=C:\Users\ksaff\Release\tag\app\chrome\icons\default\winmain.ico
+SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
 Compression=lzma
 SolidCompression=yes
 WizardImageFile=wizcreorga.bmp