var defdb = system.appdir() + system.sep() + 'defaults'+ system.sep() + 'profile' + system.sep() + 'creorga.sqlite';
// var dbfiles = appdb.getdatabases();
- alert(JSON.stringify(sitecfg));
+ //alert(JSON.stringify(sitecfg));
// for (var cdb in dbfiles){
if (system.fileexists(dbpath)){
"C:\Windows\system32\xcopy.exe" "C:\Users\ksaff\Workspace\Creorga\app_v3\chrome\*" "C:\Users\ksaff\Debug\Creorga\chrome\" /E /Y /Q
"C:\Windows\system32\xcopy.exe" "C:\Users\ksaff\Workspace\Creorga\app_v3\defaults\*" "C:\Users\ksaff\Debug\Creorga\defaults\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Users\ksaff\Workspace\Creorga\app_v3\chrome.manifest_staff" "C:\Users\ksaff\Debug\Creorga\chrome.manifest" /E /Y /Q
+"C:\Windows\system32\xcopy.exe" "C:\Users\ksaff\Workspace\Creorga\app_v3\chrome.manifest" "C:\Users\ksaff\Debug\Creorga\chrome.manifest" /E /Y /Q
"C:\Users\ksaff\Debug\Creorga\Creorga.exe" -jsconsole
\ No newline at end of file
use File::Copy;
use File::Copy::Recursive qw(rcopy);
use File::Find::Rule;
-use Getopt::Long;
+#use Getopt::Long;
+use FindBin qw($Bin);
use File::Path qw(make_path remove_tree);
+
use Data::Dumper;
my $tag="";
-my $showtags = 0;
+#my $showtags = 0;
my $setup = "";
my $h = $ENV{'HOME'};
+my $reppath = dirname($Bin);
my $ffpath = "$h/Workspace/xulrunner/Firefox.app/Contents";
-GetOptions("tag|t=s" => \$tag, "showtags|s" => \$showtags,"version|v=s" => \$setup);
-
-
+my $releasepath = $ENV{"HOME"}."/Release";
+my $setuppath = $ENV{"HOME"}."/Setups";
+print "Repository Path:".$reppath."\n";
+print "Release Path:".$releasepath."\n";
+print "Setup Path:".$setuppath."\n";
- chdir $h."/Workspace/creorga";
- my $strtags = `"git" for-each-ref --sort=-creatordate --format="%(refname)" refs/tags`;
+chdir $reppath;
+my $strtags = `"git" for-each-ref --sort=-creatordate --format="%(refname)" refs/tags`;
- my @tags = split("\n",$strtags);
- my @tex = grep(/^refs\/tags\/$tag$/,@tags);
- if ($showtags == 1) {
- foreach my $t (reverse(@tags)){
- print $t."\n";
- }
- exit(0);
- }
+my @tags = split("\n",$strtags);
+my @tex = grep(/^refs\/tags\/$tag$/,@tags);
- remove_tree($h."/Release",{keep_root => 1});
+ foreach my $t (reverse(@tags)){
+ $t =~ s/refs\/tags\///;
+ print $t."\n";
+ }
+
+# exit(0);
+#}
+print "Select tag:\nTag:";
+$tag = <STDIN>;
+chomp($tag);
- if (scalar(@tex) > 0) {
+print "Compiling Creorga ".$setup." version ".$tag."\n";
+if (! -d $releasepath){
+ mkdir($releasepath);
+}
+else {
+ remove_tree($releasepath,{keep_root => 1});
+}
+chdir $reppath;
+if (scalar(@tex) > 0) {
print "Tag $tag exists!\n";
}else {
print "Tag $tag does not exist!\n";
chdir $h."/Workspace/Creorga";
system('git tag '.$tag.' -m "Version '.$tag.'";');
}
- system('git archive -o "'.$h.'/Release/Creorga_'.$tag.'.zip" '.$tag.'');
- make_path($h."/Release/tag");
- chdir $h."/Release/tag";
- system('unzip -o "'.$h.'/Release/Creorga_'.$tag.'.zip"');
- chdir $h."/Release/tag/app";
-
+system('git archive -o "'.$h.'/Release/Creorga_'.$tag.'.zip" '.$tag.'');
+make_path("$releasepath/tag");
+chdir "$releasepath/tag";
+system('unzip -o "'.$releasepath.'/Creorga_'.$tag.'.zip"');
+
+chdir "$releasepath/tag/app_v3";
+make_path("$releasepath/dist");
+make_path("$releasepath/dist/director");
-if ($setup eq "director"){
+rcopy("$releasepath/tag/app_v3","$releasepath/dist/director");
+
my @unused_files = File::Find::Rule->file()
->name( qr/.+_basic.*/ )
- ->in($h."/Release/tag/app");
- foreach my $a (@unused_files){
- print "unlink $a\n";
- unlink($a);
- }
- @unused_files = File::Find::Rule->file()
- ->name( qr/.+_free.*/ )
- ->in($h."/Release/tag/app");
+ ->in("$releasepath/dist/director");
foreach my $a (@unused_files){
print "unlink $a\n";
unlink($a);
}
-
- remove_tree($h."/Release/tag/app/chrome/content/modules/staff_basic");
- remove_tree($h."/Release/tag/app/chrome/content/modules/default_free");
-} elsif ($setup eq "staff"){
-
- my @unused_files = File::Find::Rule->file()
- ->name( qr/.+_standard.*/ )
- ->in($h."/Release/tag/app");
- foreach my $a (@unused_files){
- print "unlink $a\n";
- unlink($a);
- }
- remove_tree($h."/Release/tag/app/chrome/content/modules/default_standard");
- remove_tree($h."/Release/tag/app/chrome/content/modules/accounting");
-
-} elsif ($setup eq "localmanager"){
-
+
+ remove_tree("$releasepath/dist/director/chrome/content/modules/staff_basic");
+ copy("$releasepath/tag/app_v3/chrome.manifest","$releasepath/dist/director/chrome.manifest");
+ chdir("$releasepath/dist/director");
+ system('zip -r creorga_standard.jar chrome');
+
+make_path("$releasepath/dist/staff");
+rcopy("$releasepath/tag/app_v3","$releasepath/dist/staff");
+
+
my @unused_files = File::Find::Rule->file()
->name( qr/.+_standard.*/ )
- ->in($h."/Release/tag/app");
+ ->in("$releasepath/dist/staff");
foreach my $a (@unused_files){
print "unlink $a\n";
unlink($a);
}
- remove_tree($h."/Release/tag/app/chrome/content/modules/default_standard");
- remove_tree($h."/Release/tag/app/chrome/content/modules/accounting");
-
-} elsif ($setup eq "free"){
+
+
+ system('zip -r creorga_standard.jar chrome');
+
+make_path("$releasepath/dist/localmanager");
+rcopy("$releasepath/tag/app_v3","$releasepath/dist/localmanager");
+
+
my @unused_files = File::Find::Rule->file()
->name( qr/.+_standard.*/ )
- ->in($h."/Release/tag/app");
+ ->in("$releasepath/dist/localmanager");
foreach my $a (@unused_files){
print "unlink $a\n";
unlink($a);
}
- @unused_files = File::Find::Rule->file()
- ->name( qr/.+_basic.*/ )
- ->in($h."/Release/tag/app");
- foreach my $a (@unused_files){
- print "unlink $a\n";
- unlink($a);
+ unlink("$releasepath/dist/localmanager/chrome/content/modules/logbook/logbook.xul");
+ unlink("$releasepath/dist/localmanager/chrome/content/modules/logbook/logactivity.html");
+ unlink("$releasepath/dist/localmanager/chrome/content/modules/logbook/js/logactivity.js");
+ remove_tree("$releasepath/dist/localmanager/chrome/content/modules/default_standard");
+ remove_tree("$releasepath/dist/localmanager/chrome/content/modules/accounting");
+ copy("$releasepath/tag/app_v3/chrome.manifest_localmanager","$releasepath/dist/localmanager/chrome.manifest");
+ chdir("$releasepath/dist/localmanager");
+ system('zip -r creorga_standard.jar chrome');
+
+rcopy("$reppath/install/windows/xulrunner","$releasepath/dist/xulrunner");
+
+copy("$reppath/install/windows/xulrunner/Creorga.exe","$releasepath/dist/Creorga.exe");
+copy("$reppath/install/windows/xulrunner/vc_redist.x86.exe","$releasepath/dist/vcredist_x86.exe");
+copy("$releasepath/tag/app_v3/creorga_".$setup.".jar","$releasepath/dist/creorga.jar");
+
+rcopy("$releasepath/tag/app_v3/defaults","$releasepath/dist/defaults");
+if ($tag !~ /beta/) {
+ unlink("$releasepath/dist/defaults/preferences/debug.js");
+}
+unlink("$releasepath/dist/xulrunner/redit.exe");
+unlink("$releasepath/dist/xulrunner/xulrunner-stub.exe");
+#changing version director localmanager staff
+my @x = ("director","localmanager","staff");
+for my $vv (@x){
+ open(CHR,"$releasepath/dist/$vv/chrome.manifest");
+ my $nf = "";
+ while (my $l = <CHR>) {
+ $l =~ s|chrome\/|jar:creorga.jar!\/chrome\/|g;
+ $nf .= $l;
}
+ open(NCHR,">$releasepath/dist/$vv/chrome.manifest");
+ print NCHR $nf;
+ close(NCHR);
+
+ my @ct = localtime();
+ $ct[5] = $ct[5] + 1900;
+ $ct[4] = $ct[4] + 1;
+ if ($ct[4] < 10) { $ct[4] = "0".$ct[4]}
+ if ($ct[3] < 10) { $ct[3] = "0".$ct[3]}
+
+
+ open(APP,">$releasepath/dist/$vv/application.ini");
+ print APP "[App]\n";
+ print APP "Vendor=DKS\n";
+ print APP "Name=Creorga\n";
+ print APP "Version=".$tag."\n";
+ print APP "BuildID=".$ct[5].$ct[4].$ct[3]."\n";
+ print APP "Copyright=Copyright (c) ".$ct[5]." DKS sarl\n";
+ print APP "ID=creorga.".$vv."\@dks.lu\n";
+ print APP "Profile=Creorga\n\n";
+ print APP "[Gecko]\n";
+ print APP "MinVersion=38.0.6\n";
+ print APP "MaxVersion=38.0.6\n";
+ close(APP);
+}
move($h."/Release/tag/app/chrome/content/js/init_free.js",$h."/Release/tag/app/chrome/content/js/init.js");
move($h."/Release/tag/app/chrome/content/modules/staff/coworker_free.html",$h."/Release/tag/app/chrome/content/modules/staff/coworker.html");
move($h."/Release/tag/app/chrome/content/creorga_free.xul",$h."/Release/tag/app/chrome/content/creorga.xul");
use File::Copy;
use File::Copy::Recursive qw(rcopy);
use File::Find::Rule;
-use Getopt::Long;
+#use Getopt::Long;
use File::Basename;
use FindBin qw($Bin);
use File::Path qw(make_path remove_tree);
my $tag="";
my $setup = "";
my $reppath = dirname($Bin);
+my $ffpath = $ENV{"USERPROFILE"}."\\Workspace\\xulrunner";
my $releasepath = $ENV{"USERPROFILE"}."\\Release";
my $setuppath = $ENV{"USERPROFILE"}."\\Setups";
print "Repository Path:".$reppath."\n";
chdir $reppath;
my $strtags = `"git.exe" for-each-ref --sort=-creatordate --format="%(refname)" refs/tags`;
-# my @modes = ("director","staff","localmanager");
-# print "Select Mode:\n";
-# for (my $m=0;$m<scalar(@modes);$m++){
-# print $m.": ".$modes[$m]."\n";
-# }
-# print "Mode:";
-# my $ms = <STDIN>;
-# chomp($ms);
-# $setup = $modes[$ms];
$setup = "director";
-#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";
system('"'.$reppath.'\\Tools\\7za.exe" x "'.$releasepath.'\\Creorga_'.$tag.'.zip"');
chdir "$releasepath\\tag\\app_v3";
-make_path("$releasepath\\dist");
-
make_path("$releasepath\\dist");
make_path("$releasepath\\dist\\director");
rcopy("$releasepath\\tag\\app_v3","$releasepath\\dist\\director");
system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "'.$releasepath.'\\dist\\Tools\\ovpn.exe" ovpn.pl');
#if (($setup eq "director")){
- copy("$releasepath\\Tools\\pdftotext.exe","$releasepath\\dist\\Tools\\pdftotext.exe");
+ copy("$reppath\\Tools\\pdftotext.exe","$releasepath\\dist\\Tools\\pdftotext.exe");
#chdir("$releasepath\\tag\\tools\\perl");
# chdir("$releasepath\\tag\\app_v3\\Tools");
# unlink("$releasepath\\tag\\app_v3\\Tools\\vpnclose.sh");
AppName={#MyAppName}
AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
DefaultDirName={pf}\{#MyAppName}
DisableDirPage=yes
DefaultGroupName={#MyAppName}
-;LicenseFile=C:\Users\ksaff\Release\tag\License.txt
OutputDir=C:\Users\ksaff\Release
OutputBaseFilename=Update_Creorga_{#MyAppVersion}_director
[Languages]
Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-;[Tasks]
-;Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Dirs]
Name: "{app}";
Name: "{app}\Tools"; Permissions: users-modify
Name: "{app}\defaults"; Permissions: users-modify
[Files]
-;Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\ksaff\Release\dist\Tools\ovpn.exe"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\ksaff\Release\dist\Tools\creorgadb.exe"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\ksaff\Release\dist\Tools\pdfextract.exe"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\ksaff\Release\dist\Tools\pdftotext.exe"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
+
Source: "C:\Users\ksaff\Release\dist\director\application.ini"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
Source: "C:\Users\ksaff\Release\dist\director\chrome.manifest"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
Source: "C:\Users\ksaff\Release\dist\director\creorga.jar"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\checkschema.txt"; DestDir: "{userappdata}\Creorga\Profiles"; Flags: overwritereadonly ignoreversion
-;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-;[Icons]
-;Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-;Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-;Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-;Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
[Run]
-;Filename: "{app}\Tools\vcredist_x86.exe"; Parameters:"/q /passive /verysilent /norestart /q:a /c:""msiexec /i vcredist.msi /qn""" ;Check: VCRedistNeedsInstall; WorkingDir: {app}\Tools; StatusMsg: Installation Microsoft Visual C++ Redistributable ...;
-;Filename: {tmp}\vcredist_x86.exe; Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"" ";
-;Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q /norestart /q:a /c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Check: VCRedistNeedsInstall; WorkingDir: {app}\bin;
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-;[Code]
-;#IFDEF UNICODE
-; #DEFINE AW "W"
-;#ELSE
-; #DEFINE AW "A"
-;#ENDIF
-;type
-; INSTALLSTATE = Longint;
-;const
-; INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function.
-; INSTALLSTATE_UNKNOWN = -1; // The product is neither advertised or installed.
-; INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed.
-; INSTALLSTATE_ABSENT = 2; // The product is installed for a different user.
-; INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user.
-
-;// Visual C++ 2015 Redistributable 14.0.23026
-; VC_2015_REDIST_X86_MIN = '{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}';
-; VC_2015_REDIST_X64_MIN = '{0D3E9E15-DE7A-300B-96F1-B4AF12B96488}';
-
-; VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
-; VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
-
-;function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-; external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-;function VCVersionInstalled(const ProductID: string): Boolean;
-;begin
-; Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
-;end;
-
-;function VCRedistNeedsInstall: Boolean;
-;begin
-; Result := not (VCVersionInstalled(VC_2015_REDIST_X86_MIN) or VCVersionInstalled(VC_2015_REDIST_X86_ADD));
-;end;
AppName={#MyAppName}
AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
DefaultDirName={pf}\{#MyAppName}
DisableDirPage=yes
DefaultGroupName={#MyAppName}
-;LicenseFile=C:\Users\ksaff\Release\tag\License.txt
OutputDir=C:\Users\ksaff\Release
OutputBaseFilename=Update_Creorga_{#MyAppVersion}_localmanager
[Languages]
Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-;[Tasks]
-;Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Dirs]
Name: "{app}";
Name: "{app}\Tools"; Permissions: users-modify
Name: "{app}\defaults"; Permissions: users-modify
[Files]
-;Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
+
+Source: "C:\Users\ksaff\Release\dist\Tools\ovpn.exe"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
Source: "C:\Users\ksaff\Release\dist\localmanager\application.ini"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
Source: "C:\Users\ksaff\Release\dist\localmanager\chrome.manifest"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
Source: "C:\Users\ksaff\Release\dist\localmanager\creorga.jar"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\checkschema.txt"; DestDir: "{userappdata}\Creorga\Profiles"; Flags: overwritereadonly ignoreversion
-;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-;[Icons]
-;Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-;Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-;Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-;Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
[Run]
-;Filename: "{app}\Tools\vcredist_x86.exe"; Parameters:"/q /passive /verysilent /norestart /q:a /c:""msiexec /i vcredist.msi /qn""" ;Check: VCRedistNeedsInstall; WorkingDir: {app}\Tools; StatusMsg: Installation Microsoft Visual C++ Redistributable ...;
-;Filename: {tmp}\vcredist_x86.exe; Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"" ";
-;Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q /norestart /q:a /c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Check: VCRedistNeedsInstall; WorkingDir: {app}\bin;
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-;[Code]
-;#IFDEF UNICODE
-; #DEFINE AW "W"
-;#ELSE
-; #DEFINE AW "A"
-;#ENDIF
-;type
-; INSTALLSTATE = Longint;
-;const
-; INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function.
-; INSTALLSTATE_UNKNOWN = -1; // The product is neither advertised or installed.
-; INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed.
-; INSTALLSTATE_ABSENT = 2; // The product is installed for a different user.
-; INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user.
-
-;// Visual C++ 2015 Redistributable 14.0.23026
-; VC_2015_REDIST_X86_MIN = '{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}';
-; VC_2015_REDIST_X64_MIN = '{0D3E9E15-DE7A-300B-96F1-B4AF12B96488}';
-
-; VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
-; VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
-
-;function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-; external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-;function VCVersionInstalled(const ProductID: string): Boolean;
-;begin
-; Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
-;end;
-
-;function VCRedistNeedsInstall: Boolean;
-;begin
-; Result := not (VCVersionInstalled(VC_2015_REDIST_X86_MIN) or VCVersionInstalled(VC_2015_REDIST_X86_ADD));
-;end;
AppName={#MyAppName}
AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
DefaultDirName={pf}\{#MyAppName}
DisableDirPage=yes
DefaultGroupName={#MyAppName}
-;LicenseFile=C:\Users\ksaff\Release\tag\License.txt
OutputDir=C:\Users\ksaff\Release
OutputBaseFilename=Update_Creorga_{#MyAppVersion}_staff
[Languages]
Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-;[Tasks]
-;Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Dirs]
Name: "{app}";
Name: "{app}\Tools"; Permissions: users-modify
Name: "{app}\defaults"; Permissions: users-modify
[Files]
-;Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
+
+Source: "C:\Users\ksaff\Release\dist\Tools\ovpn.exe"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
Source: "C:\Users\ksaff\Release\dist\staff\application.ini"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
Source: "C:\Users\ksaff\Release\dist\staff\chrome.manifest"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
Source: "C:\Users\ksaff\Release\dist\staff\creorga.jar"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\checkschema.txt"; DestDir: "{userappdata}\Creorga\Profiles"; Flags: overwritereadonly ignoreversion
-;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-;[Icons]
-;Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-;Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-;Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-;Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
[Run]
-;Filename: "{app}\Tools\vcredist_x86.exe"; Parameters:"/q /passive /verysilent /norestart /q:a /c:""msiexec /i vcredist.msi /qn""" ;Check: VCRedistNeedsInstall; WorkingDir: {app}\Tools; StatusMsg: Installation Microsoft Visual C++ Redistributable ...;
-;Filename: {tmp}\vcredist_x86.exe; Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"" ";
-;Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q /norestart /q:a /c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Check: VCRedistNeedsInstall; WorkingDir: {app}\bin;
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-;[Code]
-;#IFDEF UNICODE
-; #DEFINE AW "W"
-;#ELSE
-; #DEFINE AW "A"
-;#ENDIF
-;type
-; INSTALLSTATE = Longint;
-;const
-; INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function.
-; INSTALLSTATE_UNKNOWN = -1; // The product is neither advertised or installed.
-; INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed.
-; INSTALLSTATE_ABSENT = 2; // The product is installed for a different user.
-; INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user.
-
-;// Visual C++ 2015 Redistributable 14.0.23026
-; VC_2015_REDIST_X86_MIN = '{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}';
-; VC_2015_REDIST_X64_MIN = '{0D3E9E15-DE7A-300B-96F1-B4AF12B96488}';
-
-; VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
-; VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
-
-;function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-; external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-;function VCVersionInstalled(const ProductID: string): Boolean;
-;begin
-; Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
-;end;
-;function VCRedistNeedsInstall: Boolean;
-;begin
-; Result := not (VCVersionInstalled(VC_2015_REDIST_X86_MIN) or VCVersionInstalled(VC_2015_REDIST_X86_ADD));
-;end;
projects / creorga.git / commitdiff