summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2015-04-28 18:44:30 +0800
committerruki <[email protected]>2015-04-28 18:44:30 +0800
commit47887f7de8de004290bd3c53d5536ed43c7e3f71 (patch)
treeb0caee87f82e7522064351fe8b197351a5cbe094
parent3dfa09ba04c127a68d47b6144b586006a95b6820 (diff)
add arguments list for install
-rwxr-xr-xinstall5
-rw-r--r--install.bat2
-rw-r--r--xmake/scripts/xmake_main.lua4
3 files changed, 7 insertions, 4 deletions
diff --git a/install b/install
index 1a936d3db..324f70d23 100755
--- a/install
+++ b/install
@@ -42,7 +42,8 @@ if [ -f .config.mak ]; then
fi
make f DEBUG=$debug > ../install.log
if [ $? -ne 0 ]; then exit; fi
-make r >> ../install.log
+make c >> ../install.log
+make >> ../install.log
if [ $? -ne 0 ]; then exit; fi
cd ..
@@ -68,7 +69,7 @@ if [ $? -ne 0 ]; then exit; fi
xmake_loader=/tmp/xmake_loader
echo "#!/bin/bash" > $xmake_loader
echo "export XMAKE_PROGRAM_DIR=$xmake_dir_install" >> $xmake_loader
-echo "$xmake_core_install $verbose" >> $xmake_loader
+echo "$xmake_core_install $verbose \$*" >> $xmake_loader
if [ $? -ne 0 ]; then exit; fi
# install the xmake loader
diff --git a/install.bat b/install.bat
index e4e0d4db6..4c39de496 100644
--- a/install.bat
+++ b/install.bat
@@ -48,7 +48,7 @@ rem make the xmake loader
set xmake_loader=%temp%\xmake_loader
echo @echo off > %xmake_loader%
echo set XMAKE_PROGRAM_DIR=%xmake_dir_install%>> %xmake_loader%
-echo "%xmake_core_install%" >> %xmake_loader%
+echo "%xmake_core_install%" %%* >> %xmake_loader%
rem install the xmake loader
set xmake_loader_install=%xmake_dir_install%\xmake.bat
diff --git a/xmake/scripts/xmake_main.lua b/xmake/scripts/xmake_main.lua
index 482fb6ac0..79623adfe 100644
--- a/xmake/scripts/xmake_main.lua
+++ b/xmake/scripts/xmake_main.lua
@@ -2,5 +2,7 @@
print("_PROGRAM_DIR: ", _PROGRAM_DIR)
print("_PROJECT_DIR: ", _PROJECT_DIR)
-
+for _, b in pairs(_ARGV) do
+ print(b)
+end