Merge branch 'master' into stable

redeclipse · Jan 17, 2017 · f7fea85 · f7fea85
2 parents 0b8255f + 43b540f
commit f7fea85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/install/win/redeclipse.nsi b/src/install/win/redeclipse.nsi
@@ -1,9 +1,9 @@
 ; --------------------------------
 ; Name and file
   Name "Red Eclipse"
-  VIProductVersion "1.5.6.0"
+  VIProductVersion "1.5.8.0"
   !define MajorMinorVer "1.5.x"
-  OutFile "redeclipse_1.5.6_win.exe"
+  OutFile "redeclipse_1.5.8_win.exe"
   VIAddVersionKey "OriginalFilename" $OutFile
 ; --------------------------------
 ; Installer information

diff --git a/src/semdeploy.sh b/src/semdeploy.sh
@@ -39,10 +39,10 @@ done
 
 rm -rf "${SEMABUILD_PWD}/data" "${SEMABUILD_PWD}/.git"
 
-SEMABUILD_NAME=`sed -n 's/.define VERSION_NAME *"\([^"]*\)"/\1/p' "${SEMABUILD_PWD}/engine/version.h"`
-SEMABUILD_UNAME=`sed -n 's/.define VERSION_UNAME *"\([^"]*\)"/\1/p' "${SEMABUILD_PWD}/engine/version.h"`
-SEMABUILD_VERSION=`sed -n 's/.define VERSION_STRING *"\([^"]*\)"/\1/p' "${SEMABUILD_PWD}/engine/version.h"`
-SEMABUILD_RELEASE=`sed -n 's/.define VERSION_RELEASE *"\([^"]*\)"/\1/p' "${SEMABUILD_PWD}/engine/version.h"`
+SEMABUILD_NAME=`sed -n 's/.define VERSION_NAME *"\([^"]*\)"/\1/p' "${SEMABUILD_PWD}/src/engine/version.h"`
+SEMABUILD_UNAME=`sed -n 's/.define VERSION_UNAME *"\([^"]*\)"/\1/p' "${SEMABUILD_PWD}/src/engine/version.h"`
+SEMABUILD_VERSION=`sed -n 's/.define VERSION_STRING *"\([^"]*\)"/\1/p' "${SEMABUILD_PWD}/src/engine/version.h"`
+SEMABUILD_RELEASE=`sed -n 's/.define VERSION_RELEASE *"\([^"]*\)"/\1/p' "${SEMABUILD_PWD}/src/engine/version.h"`
 
 ${SEMABUILD_GHR} --verbose release --user "red-eclipse" --repo "base" --tag "v${SEMABUILD_VERSION}" --name "v${SEMABUILD_VERSION} (${SEMABUILD_RELEASE})" --description "${SEMABUILD_NAME} v${SEMABUILD_VERSION} (${SEMABUILD_RELEASE}) has been released!" --target "stable" --draft