diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2019-05-23 10:22:15 +0200 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2019-05-23 10:22:15 +0200 |
| commit | 0fcdc63f14a929c958952015ddba7134bb38156d (patch) | |
| tree | c9814c20f02d0b3239b2e7e07bc5c0acc143d359 | |
| parent | f8ee49b34a703ddfc969e5452c2aca4523351d1e (diff) | |
#913: Using version file to generate OGAgent for Windows.
| -rwxr-xr-x | admin/Sources/Clients/ogagent/windows/build-windows.sh | 6 | ||||
| -rw-r--r-- | admin/Sources/Clients/ogagent/windows/ogagent.nsi | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/admin/Sources/Clients/ogagent/windows/build-windows.sh b/admin/Sources/Clients/ogagent/windows/build-windows.sh index d7248ab7..88a3c4ed 100755 --- a/admin/Sources/Clients/ogagent/windows/build-windows.sh +++ b/admin/Sources/Clients/ogagent/windows/build-windows.sh @@ -1,5 +1,7 @@ #!/bin/bash +cd "$(dirname "$0")" export WINEARCH=win32 -export WINEPREFIX=$(realpath $(dirname $0)/wine) +export WINEPREFIX=$PWD/wine +grep -o "[0-9]*\.[0-9]*\.[0-9]*" ../src/VERSION > VERSION wine cmd /c c:\\ogagent\\build.bat -chmod -x $(dirname $0)/../OGAgentSetup*.exe +chmod -x ../OGAgentSetup*.exe diff --git a/admin/Sources/Clients/ogagent/windows/ogagent.nsi b/admin/Sources/Clients/ogagent/windows/ogagent.nsi index 88c9ab2f..8caf6738 100644 --- a/admin/Sources/Clients/ogagent/windows/ogagent.nsi +++ b/admin/Sources/Clients/ogagent/windows/ogagent.nsi @@ -2,12 +2,17 @@ # Copy inside the two x86_xxxxx folders inside nsis plugins folder
Name "OpenGnsys Agent"
-# OpenGnsys Actor version
+# OpenGnsys Agent version
!define /file OGA_VERSION "src\VERSION"
+!define /file OGA_WINVERSION "windows\VERSION"
# General Symbol Definitions
!define REGKEY "SOFTWARE\OGAgent"
-!define VERSION ${OGA_VERSION}.0
+!if ${OGA_VERSION} == ${OGA_WINVERSION}
+ !define VERSION ${OGA_WINVERSION}.0
+!else
+ !define VERSION ${OGA_WINVERSION}.1
+!endif
!define COMPANY "OpenGnsys Project"
!define URL https://opengnsys.es
|