summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/debian/control2
-rwxr-xr-xscripts/get.sh4
-rw-r--r--scripts/installer.nsi12
-rw-r--r--scripts/makeself/header2
4 files changed, 10 insertions, 10 deletions
diff --git a/scripts/debian/control b/scripts/debian/control
index c75388c2d..6230cfb19 100644
--- a/scripts/debian/control
+++ b/scripts/debian/control
@@ -5,7 +5,7 @@ Maintainer: ruki <[email protected]>
Build-Depends: debhelper (>=9)
Standards-Version: 3.9.7
Homepage: http://xmake.io
-#Vcs-Git: [email protected]:tboox/xmake.git
+#Vcs-Git: [email protected]:xmake-io/xmake.git
#Vcs-Browser: https://github.com/xmake-io/xmake.git
Package: xmake
diff --git a/scripts/get.sh b/scripts/get.sh
index a0d49c528..fa74379d9 100755
--- a/scripts/get.sh
+++ b/scripts/get.sh
@@ -143,9 +143,9 @@ if [ 'x__install_only__' != "x$2" ]; then
fi
# make bytecodes
-export XMAKE_PROGRAM_DIR=$projectdir/xmake
+XMAKE_PROGRAM_DIR="$projectdir/xmake" \
+XMAKE_ROOT=y \
$projectdir/core/src/demo/demo.b l -v private.utils.bcsave --rootname='@programdir' -x 'scripts/**|templates/**' $projectdir/xmake || my_exit 'generate bytecode failed!'
-export XMAKE_PROGRAM_DIR=
# do install
if [ "$prefix" = "" ]; then
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
_
__ ___ __ __ __ _| | ______