diff options
| -rwxr-xr-x | setup/package.sh | 18 | ||||
| -rw-r--r-- | setup/windows/traccar.iss | 14 |
2 files changed, 31 insertions, 1 deletions
diff --git a/setup/package.sh b/setup/package.sh index 5750eebd9..e792f6203 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -81,12 +81,30 @@ zip -j tracker-server-$1.zip ../target/tracker-server.jar universal/README.txt innoextract isetup-*.exe echo "NOTE: if you got any errors here try isetup version 5.5.0 (or check what versions are supported by 'innoextract -v')" +# windows 32 + wine app/ISCC.exe windows/traccar.iss zip -j traccar-windows-32-$1.zip windows/Output/setup.exe windows/README.txt rm -rf windows/Output/ rm -rf tmp/ + +# windows 64 + +unzip wrapper-windows-x86-64-*.zip +cp wrapper_*_src/bin/wrapper.exe wrapper/bin/wrapper-windows-x86-32.exe +cp wrapper_*_src/lib/wrapper.dll wrapper/lib/wrapper-windows-x86-32.dll +cp wrapper_*_src/lib/wrapper.jar wrapper/lib/wrapper.jar +rm -rf wrapper_*_src + +wine app/ISCC.exe windows/traccar.iss + +zip -j traccar-windows-64-$1.zip windows/Output/setup.exe windows/README.txt + +rm -rf windows/Output/ +rm -rf tmp/ + rm -rf app/ # LINIX PACKAGE diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss index 0b37399d3..4d8ab7af5 100644 --- a/setup/windows/traccar.iss +++ b/setup/windows/traccar.iss @@ -32,9 +32,21 @@ Filename: "{app}\bin\InstallTraccar-NT.bat" Filename: "{app}\bin\UninstallTraccar-NT.bat"
[Code]
+function GetLocalMachine(): Integer;
+begin
+ if IsWin64 then
+ begin
+ Result := HKLM64;
+ end
+ else
+ begin
+ Result := HKEY_LOCAL_MACHINE;
+ end;
+end;
+
function InitializeSetup(): Boolean;
begin
- if RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\JavaSoft\Java Runtime Environment') then
+ if RegKeyExists(GetLocalMachine(), 'SOFTWARE\JavaSoft\Java Runtime Environment') then
begin
Result := true;
end
|