Merge branch 'devel' into uefi

Fast Foward

5 files changed, 13 insertions, 5 deletions

diff --git a/admin/Database/ogAdmBD-1.1.0-1.1.1.sql b/admin/Database/ogAdmBD-1.1.0-1.1.1.sql
new file mode 120000
index 00000000..fd52f3c8
--- /dev/null
+++ b/admin/Database/ogAdmBD-1.1.0-1.1.1.sql
@@ -0,0 +1 @@
+ogAdmBD-1.1.0a-1.1.1.sql
\ No newline at end of file
diff --git a/admin/Database/ogAdmBD-1.1.0a-1.1.1pre.sql b/admin/Database/ogAdmBD-1.1.0a-1.1.1.sql
index d0b3e0a7..d0b3e0a7 100644
--- a/admin/Database/ogAdmBD-1.1.0a-1.1.1pre.sql
+++ b/admin/Database/ogAdmBD-1.1.0a-1.1.1.sql
diff --git a/admin/Database/ogAdmBD-1.1.1pre.sql b/admin/Database/ogAdmBD-1.1.1pre-1.1.1.sql
index d10e2e5d..2d54e3a9 100644
--- a/admin/Database/ogAdmBD-1.1.1pre.sql
+++ b/admin/Database/ogAdmBD-1.1.1pre-1.1.1.sql
@@ -1,5 +1,5 @@
 ### Fichero de actualización de la base de datos.
-# OpenGnsys 1.1.1
+# OpenGnsys 1.1.1pre - OpenGnsys 1.1.1
 #use ogAdmBD
 
 # Eliminar procedimiento y disparador para evitar errores de ejecución.
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