From 67cbebf3a29ebb999e86e504b54d43e0c91db094 Mon Sep 17 00:00:00 2001 From: Opportunity Date: Sun, 19 Jan 2020 16:29:33 +0800 Subject: fix build script --- scripts/installer.nsi | 12 ++++++------ scripts/makeself/header | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts') 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 _ __ ___ __ __ __ _| | ______ -- cgit v1.3.1