summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpportunity <[email protected]>2020-01-19 16:29:33 +0800
committerOpportunity <[email protected]>2020-01-19 16:29:33 +0800
commit67cbebf3a29ebb999e86e504b54d43e0c91db094 (patch)
tree8d370ca609022a6730d6901497c2ab33327fff2a
parent3a1afba247944db42a01af2e585b5381758e4e63 (diff)
fix build script
-rw-r--r--core/src/demo/xmake.rc2
-rw-r--r--scripts/installer.nsi12
-rw-r--r--scripts/makeself/header2
-rw-r--r--tests/projects/winsdk/windemo/test2
-rw-r--r--tests/projects/winsdk/windemo/test.rc2
5 files changed, 10 insertions, 10 deletions
diff --git a/core/src/demo/xmake.rc b/core/src/demo/xmake.rc
index 0b5b17fbe..0d737ebc3 100644
--- a/core/src/demo/xmake.rc
+++ b/core/src/demo/xmake.rc
@@ -26,7 +26,7 @@ BEGIN
VALUE "FileDescription", "XMake build utility"
VALUE "FileVersion", XM_CONFIG_VERSION "+" STR(XM_CONFIG_VERSION_BUILD)
VALUE "InternalName", "xmake"
- VALUE "LegalCopyright", "Copyright (C) 2015-2019 Ruki Wang, tboox.org, xmake.io\nCopyright (C) 2005-2015 Mike Pall, luajit.org"
+ VALUE "LegalCopyright", "Copyright (C) 2015-2020 Ruki Wang, tboox.org, xmake.io\nCopyright (C) 2005-2015 Mike Pall, luajit.org"
VALUE "LegalTrademarks", ""
VALUE "OriginalFilename", "xmake.exe"
VALUE "ProductName", "XMake"
diff --git a/scripts/installer.nsi b/scripts/installer.nsi
index d5b82e06f..873559961 100644
--- a/scripts/installer.nsi
+++ b/scripts/installer.nsi
@@ -15,16 +15,16 @@
; xmake version Information
!ifndef MAJOR
- !define MAJOR 2
+ !error 'xmake major version is not defined!'
!endif
!ifndef MINOR
- !define MINOR 2
+ !error 'xmake minor version is not defined!'
!endif
!ifndef ALTER
- !define ALTER 9
+ !error 'xmake alter version is not defined!'
!endif
!ifndef BUILD
- !define BUILD 201912200000
+ !error 'xmake build version is not defined!'
!endif
!define VERSION ${MAJOR}.${MINOR}.${ALTER}
@@ -137,7 +137,7 @@ VIFileVersion ${VERSION}.0
VIAddVersionKey /LANG=0 ProductName XMake
VIAddVersionKey /LANG=0 Comments "A cross-platform build utility based on Lua$\nwebsite: https://xmake.io"
VIAddVersionKey /LANG=0 CompanyName "The TBOOX Open Source Group"
-VIAddVersionKey /LANG=0 LegalCopyright "Copyright (C) 2015-2019 Ruki Wang, tboox.org, xmake.io$\nCopyright (C) 2005-2015 Mike Pall, luajit.org"
+VIAddVersionKey /LANG=0 LegalCopyright "Copyright (C) 2015-2020 Ruki Wang, tboox.org, xmake.io$\nCopyright (C) 2005-2015 Mike Pall, luajit.org"
VIAddVersionKey /LANG=0 FileDescription "XMake Installer - v${VERSION}"
VIAddVersionKey /LANG=0 OriginalFilename "xmake-${ARCH}.exe"
VIAddVersionKey /LANG=0 FileVersion ${VERSION_FULL}
@@ -232,7 +232,7 @@ Section "XMake (required)" InstallExeutable
; Put file there
File /r /x ".DS_Store" /x "*.swp" "..\xmake\*.*"
File "..\*.md"
- File "..\build\xmake.exe"
+ File "..\core\build\xmake.exe"
File /r /x ".DS_Store" "..\winenv"
WriteUninstaller "uninstall.exe"
diff --git a/scripts/makeself/header b/scripts/makeself/header
index a65aeddf0..0a539e197 100644
--- a/scripts/makeself/header
+++ b/scripts/makeself/header
@@ -1,5 +1,5 @@
xmake v#xmake-version#, A cross-platform build utility based on Lua
-Copyright (C) 2015-2019 Ruki Wang, tboox.org, xmake.io
+Copyright (C) 2015-2020 Ruki Wang, tboox.org, xmake.io
Copyright (C) 2005-2015 Mike Pall, luajit.org
_
__ ___ __ __ __ _| | ______
diff --git a/tests/projects/winsdk/windemo/test b/tests/projects/winsdk/windemo/test
index 3988cc4e1..33639f71c 100644
--- a/tests/projects/winsdk/windemo/test
+++ b/tests/projects/winsdk/windemo/test
@@ -73,7 +73,7 @@ FONT 8, "MS Shell Dlg"
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,14,14,21,20
LTEXT "testw, Version 1.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX
- LTEXT "Copyright (C) 2019",IDC_STATIC,42,26,114,8
+ LTEXT "Copyright (C) 2020",IDC_STATIC,42,26,114,8
DEFPUSHBUTTON "OK",IDOK,113,41,50,14,WS_GROUP
END
diff --git a/tests/projects/winsdk/windemo/test.rc b/tests/projects/winsdk/windemo/test.rc
index 0a595f65f..9ef96ba63 100644
--- a/tests/projects/winsdk/windemo/test.rc
+++ b/tests/projects/winsdk/windemo/test.rc
@@ -73,7 +73,7 @@ FONT 8, "MS Shell Dlg"
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,14,14,21,20
LTEXT "testw, Version 1.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX
- LTEXT "Copyright (C) 2019",IDC_STATIC,42,26,114,8
+ LTEXT "Copyright (C) 2020",IDC_STATIC,42,26,114,8
DEFPUSHBUTTON "OK",IDOK,113,41,50,14,WS_GROUP
END