Skip to content

Commit

Permalink
fix build script
Browse files Browse the repository at this point in the history
  • Loading branch information
OpportunityLiu committed Jan 19, 2020
1 parent 3a1afba commit 67cbebf
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion core/src/demo/xmake.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions scripts/installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/makeself/header
Original file line number Diff line number Diff line change
@@ -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
_
__ ___ __ __ __ _| | ______
Expand Down
2 changes: 1 addition & 1 deletion tests/projects/winsdk/windemo/test
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/projects/winsdk/windemo/test.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 67cbebf

Please sign in to comment.