Commit b92cb4bc authored by Patrik Dufresne's avatar Patrik Dufresne

Support NSIS v3 #78

Convert files to UTF-8 to support NSIS
parent 809672c7
Pipeline #144873500 failed with stages
in 9 minutes and 7 seconds
......@@ -56,11 +56,11 @@ quota_test_py3:
client_sonar:
stage: build
allow_failure: true
image: debian:stretch
image: maven:3-jdk-8
script:
- cd minarca-client
- apt-get update && apt-get -qq install icoutils nsis cron gettext maven curl openjdk-8-jdk-headless git
- rm /etc/java-8-openjdk/accessibility.properties
- apt-get update
- apt-get -qq install icoutils nsis cron gettext
# Get version
- export REVISION="$(curl http://git.patrikdufresne.com/pdsl/maven-scm-version/raw/master/version.sh | bash -)"
- echo "REVISION=$REVISION"
......@@ -69,12 +69,11 @@ client_sonar:
client_build:
stage: build
image: debian:stretch
image: maven:3-jdk-8
script:
- cd minarca-client
# Setup authenticode
- apt-get update && apt-get -qq install osslsigncode icoutils nsis cron gettext maven curl openjdk-8-jdk-headless git
- rm /etc/java-8-openjdk/accessibility.properties
- apt-get update && apt-get -qq install osslsigncode icoutils nsis cron gettext
- echo "$AUTHENTICODE_CERT" | tr -d '\r' > /tmp/authenticode-certs.pem
- echo "$AUTHENTICODE_KEY" | tr -d '\r' > /tmp/authenticode.pem
# Get version
......
......@@ -209,7 +209,7 @@
<!-- Convert the license file into Window encoding -->
<copy file="${basedir}/../../LICENSE"
tofile="${project.build.directory}/package/LICENSE.txt"
encoding="UTF-8" outputencoding="ISO-8859-1" />
encoding="UTF-8" outputencoding="UTF-8" />
<exec osfamily="unix" executable="makensis" dir="${project.build.directory}/package" failonerror="true">
<!-- Avoid changing working directory -->
......
......@@ -25,26 +25,26 @@
;Language Strings
!macro JREINFO_LANGUAGE
LangString JRE_NOT_FOUND_TITLE ${LANG_ENGLISH} "JRE Installation or Update Required"
LangString JRE_NOT_FOUND_TITLE ${LANG_FRENCH} "Installation ou mise jour requise de JRE"
LangString JRE_NOT_FOUND_TITLE ${LANG_FRENCH} "Installation ou mise à jour requise de JRE"
LangString JRE_NOT_FOUND_SUBTITLE ${LANG_ENGLISH} "This application requires Java ${JRE_VERSION} or higher."
LangString JRE_NOT_FOUND_SUBTITLE ${LANG_FRENCH} "Cette application ncessite Java ${JRE_VERSION} ou suprieur."
LangString JRE_NOT_FOUND_SUBTITLE ${LANG_FRENCH} "Cette application nécessite Java ${JRE_VERSION} ou supérieur."
LangString JRE_NOT_FOUND_LABEL ${LANG_ENGLISH} "This application requires installation of the JRE. This will be downloaded and installed as part of the installation."
LangString JRE_NOT_FOUND_LABEL ${LANG_FRENCH} "Cette application ncessite l'installation de Java Runtime Environment (JRE). Il sera tlcharg et install lors de cette installation."
LangString JRE_NOT_FOUND_LABEL ${LANG_FRENCH} "Cette application nécessite l'installation de Java Runtime Environment (JRE). Il sera téléchargé et installé lors de cette installation."
LangString JRE_NOT_FOUND ${LANG_ENGLISH} "No JRE Found"
LangString JRE_NOT_FOUND ${LANG_FRENCH} "Aucun JRE trouv"
LangString JRE_NOT_FOUND ${LANG_FRENCH} "Aucun JRE trouvé"
LangString JRE_OLD_FOUND ${LANG_ENGLISH} "Old JRE found"
LangString JRE_OLD_FOUND ${LANG_FRENCH} "Veille version de JRE trouv"
LangString JRE_OLD_FOUND ${LANG_FRENCH} "Veille version de JRE trouvé"
LangString JRE_FOUND ${LANG_ENGLISH} "JRE found"
LangString JRE_FOUND ${LANG_FRENCH} "JRE trouv"
LangString JRE_FOUND ${LANG_FRENCH} "JRE trouvé"
LangString JRE_LAUNCH_SETUP ${LANG_ENGLISH} "Launching JRE setup"
LangString JRE_LAUNCH_SETUP ${LANG_FRENCH} "Lancement de l'installation de JRE"
LangString JRE_SETUP_COMPLETE ${LANG_ENGLISH} "JRE Setup finished"
LangString JRE_SETUP_COMPLETE ${LANG_FRENCH} "Installation de JRE termine"
LangString JRE_SETUP_COMPLETE ${LANG_FRENCH} "Installation de JRE terminée"
LangString JRE_DOWNLOAD ${LANG_ENGLISH} "About to download JRE from "
LangString JRE_DOWNLOAD ${LANG_FRENCH} "Tlchargement de JRE partir de "
LangString JRE_DOWNLOAD ${LANG_FRENCH} "Téléchargement de JRE à partir de "
LangString JRE_DETECT_VERSION ${LANG_ENGLISH} "Detecting JRE Version"
LangString JRE_DETECT_VERSION ${LANG_FRENCH} "Dtection de la version de JRE"
LangString JRE_DETECT_VERSION ${LANG_FRENCH} "Détection de la version de JRE"
!macroend
;--------------------------------
......
......@@ -5,6 +5,8 @@
!define Vendor "Patrik Dufresne Service Logiciel inc."
!define AppExeFile ""
Unicode True
;--------------------------------
;Includes
......@@ -34,7 +36,7 @@ SetCompressor bzip2
VIAddVersionKey "ProductName" "${AppName}"
VIAddVersionKey "Comments" "Automatically saves your data online for easy access at any time while travelling or in case of equipment loss or breakage."
VIAddVersionKey "CompanyName" "${Vendor}"
VIAddVersionKey "LegalCopyright" " ${Vendor}"
VIAddVersionKey "LegalCopyright" "© ${Vendor}"
VIAddVersionKey "FileDescription" "${AppName} ${AppVersion} Installer"
VIAddVersionKey "FileVersion" "${AppVersion}"
OutFile "${OutFile}"
......@@ -110,7 +112,7 @@ SetCompressor bzip2
;Language Strings
LangString APP_IS_RUNNING ${LANG_ENGLISH} "The installation process detected ${AppName} is running. Please close it and try again."
LangString APP_IS_RUNNING ${LANG_FRENCH} "Le processus d'installation a dtect que ${AppName} est en cours d'excution. S'il vous plat, fermez l'application et essayez nouveau."
LangString APP_IS_RUNNING ${LANG_FRENCH} "Le processus d'installation a détecté que ${AppName} est en cours d'exécution. S'il vous plaît, fermez l'application et essayez à nouveau."
;--------------------------------
;Reserve Files
......@@ -129,7 +131,7 @@ LangString APP_IS_RUNNING ${LANG_FRENCH} "Le processus d'installation a d
LangString DESC_SecAppFiles ${LANG_FRENCH} "Copie des fichiers"
LangString RunMinarca ${LANG_ENGLISH} "Start ${AppName}"
LangString RunMinarca ${LANG_FRENCH} "Dmarrer ${AppName}"
LangString RunMinarca ${LANG_FRENCH} "Démarrer ${AppName}"
;--------------------------------
;Installer Sections
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment