diff options
Diffstat (limited to 'setup')
-rw-r--r-- | setup/default.xml | 8 | ||||
-rwxr-xr-x | setup/package.sh | 29 | ||||
-rw-r--r-- | setup/traccar.iss | 2 |
3 files changed, 22 insertions, 17 deletions
diff --git a/setup/default.xml b/setup/default.xml index dea638d7a..098bdf95d 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -11,8 +11,8 @@ --> <entry key='web.port'>8082</entry> - <entry key='web.path'>./web</entry> - <entry key='web.sanitize'>true</entry> + <entry key='web.path'>./modern</entry> + <entry key='web.sanitize'>false</entry> <entry key='web.persistSession'>false</entry> <entry key='geocoder.enable'>true</entry> @@ -283,5 +283,9 @@ <entry key='armoli.port'>5238</entry> <entry key='teratrack.port'>5239</entry> <entry key='envotech.port'>5240</entry> + <entry key='bstpl.port'>5241</entry> + <entry key='thuraya.port'>5242</entry> + <entry key='ndtpv6.port'>5243</entry> + <entry key='g1rus.port'>5244</entry> </properties> diff --git a/setup/package.sh b/setup/package.sh index e5f976b79..71b86014f 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -61,17 +61,17 @@ fi if [ $PLATFORM = "all" -o $PLATFORM = "windows-64" ]; then check_requirement "Inno Extractor" "which innoextract" "Missing innoextract binary" check_requirement "Inno Setup" "ls i*setup-*.exe" "Missing Inno Setup (http://www.jrsoftware.org/isdl.php)" - check_requirement "Windows 64 Java" "ls java-*.windows.ojdkbuild.x86_64.zip" "Missing Windows 64 Java (https://github.com/ojdkbuild/ojdkbuild)" + check_requirement "Windows 64 Java" "ls OpenJDK*64_windows*.zip" "Missing Windows 64 JDK (https://adoptium.net/)" check_requirement "Wine" "which wine" "Missing wine binary" fi if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" -o $PLATFORM = "linux-arm" ]; then check_requirement "Makeself" "which makeself" "Missing makeself binary" fi if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" ]; then - check_requirement "Linux 64 Java" "ls jdk-*-linux-x64.zip" "Missing Linux 64 Java (https://github.com/ojdkbuild/contrib_jdk11u-ci/releases)" + check_requirement "Linux 64 Java" "ls OpenJDK*64_linux*.tar.gz" "Missing Linux 64 JDK (https://adoptium.net/)" fi if [ $PLATFORM = "all" -o $PLATFORM = "linux-arm" ]; then - check_requirement "Linux ARM Java" "ls jdk-*-linux-armhf.zip" "Missing Linux ARM Java (https://github.com/ojdkbuild/contrib_jdk11u-aarch32-ci/releases)" + check_requirement "Linux ARM Java" "ls OpenJDK*arm_linux*.tar.gz" "Missing Linux ARM JDK (https://adoptium.net/)" fi if [ $PREREQ = false ]; then info "Missing build requirements, aborting..." @@ -81,13 +81,14 @@ else fi prepare () { - mkdir -p out/{conf,data,lib,logs,web,schema,templates} + mkdir -p out/{conf,data,lib,logs,legacy,modern,schema,templates} cp ../target/tracker-server.jar out cp ../target/lib/* out/lib cp ../schema/* out/schema cp -r ../templates/* out/templates - cp -r ../traccar-web/web/* out/web + cp -r ../traccar-web/web/* out/legacy + cp -r ../traccar-web/modern/build/* out/modern cp default.xml out/conf cp traccar.xml out/conf @@ -118,9 +119,9 @@ package_other () { package_windows () { info "Building Windows 64 installer" - unzip -q -o java-*.windows.ojdkbuild.x86_64.zip - jlink --module-path java-*.windows.ojdkbuild.x86_64/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec --output out/jre - rm -rf java-*.windows.ojdkbuild.x86_64 + unzip -q OpenJDK*64_windows*.zip + jlink --module-path jdk-*/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec --output out/jre + rm -rf jdk-* wine app/ISCC.exe traccar.iss >/dev/null rm -rf out/jre zip -q -j traccar-windows-64-$VERSION.zip Output/traccar-setup.exe README.txt @@ -132,13 +133,13 @@ package_linux () { cp setup.sh out cp traccar.service out - unzip -q -o jdk-*-linux-$1.zip - jlink --module-path jdk-*-linux-$1/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec --output out/jre - rm -rf jdk-*-linux-$1 + tar -xf OpenJDK*$1_linux*.tar.gz + jlink --module-path jdk-*/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec --output out/jre + rm -rf jdk-* makeself --needroot --quiet --notemp out traccar.run "traccar" ./setup.sh rm -rf out/jre - zip -q -j traccar-linux-$2-$VERSION.zip traccar.run README.txt + zip -q -j traccar-linux-$1-$VERSION.zip traccar.run README.txt rm traccar.run rm out/setup.sh @@ -147,13 +148,13 @@ package_linux () { package_linux_64 () { info "Building Linux 64 installer" - package_linux x64 64 + package_linux 64 ok "Created Linux 64 installer" } package_linux_arm () { info "Building Linux ARM installer" - package_linux armhf arm + package_linux arm ok "Created Linux ARM installer" } diff --git a/setup/traccar.iss b/setup/traccar.iss index 7734f3956..3e946e672 100644 --- a/setup/traccar.iss +++ b/setup/traccar.iss @@ -1,6 +1,6 @@ [Setup] AppName=Traccar -AppVersion=5.2 +AppVersion=5.3 DefaultDirName={pf}\Traccar OutputBaseFilename=traccar-setup ArchitecturesInstallIn64BitMode=x64 |