revert root xmake.lua

6 files changed, 20 insertions, 26 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index a88b6d5d9..d1f18da21 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -41,11 +41,13 @@ before_build:
 
 build_script:
   # self build
+  - ps: Push-Location ./core
   - ps: xmake config --arch=$env:platform
   - ps: xmake build
+  - ps: Pop-Location
   # use new xmake
   - ps: Set-AppveyorBuildVariable -Name XMAKE_PROGRAM_DIR -Value $(Resolve-Path ./xmake)
-  - ps: Copy-Item -Force .\build\xmake.exe $(Get-Command xmake).Path
+  - ps: Copy-Item -Force .\core\build\xmake.exe $(Get-Command xmake).Path
   - ps: (Get-Command xmake).FileVersionInfo.ProductVersion
   # use bitcodes
   - ps: xmake l -v private.utils.bcsave --rootname='@programdir' -x 'scripts/**|templates/**' xmake
@@ -53,8 +55,8 @@ build_script:
 
 after_build:
   # publish exe
-  - ps: Push-AppveyorArtifact .\build\xmake.exe -FileName xmake.exe -DeploymentName "xmake-executable"
-  - ps: (Get-FileHash .\build\xmake.exe -Algorithm SHA256).Hash.ToLower() + " *xmake.exe`n" | Out-File ./shafile -Encoding ASCII -NoNewLine
+  - ps: Push-AppveyorArtifact .\core\build\xmake.exe -FileName xmake.exe -DeploymentName "xmake-executable"
+  - ps: (Get-FileHash .\core\build\xmake.exe -Algorithm SHA256).Hash.ToLower() + " *xmake.exe`n" | Out-File ./shafile -Encoding ASCII -NoNewLine
   # compose & publish installer
   - ps: Copy-Item C:\winenv\ . -Recurse
   - ps: $version = (Get-Command xmake).FileVersionInfo
@@ -70,7 +72,7 @@ after_build:
   # publish zip archive
   - ps: Copy-Item .\*.md .\xmake
   - ps: Copy-Item C:\winenv\ .\xmake -Recurse
-  - ps: Copy-Item .\build\xmake.exe .\xmake
+  - ps: Copy-Item .\core\build\xmake.exe .\xmake
   - ps: |-
         Add-Type -AssemblyName System.Text.Encoding
         Add-Type -AssemblyName System.IO.Compression.FileSystem
@@ -119,4 +121,3 @@ test_script:
       }
   - ps: Pop-Location
   - ps: if ($all_success) { Write-Host "All tests passed!" } else { Write-Error "Some tests failed!" }
-
diff --git a/.travis.yml b/.travis.yml
index 4ae244e19..2e2d1e71b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,11 +23,11 @@ script:
   - scripts/get.sh __local__
   - source ~/.xmake/profile
   - xmake --version
-  - xmake 
+  - xmake -P core 
   - export XMAKE_PROGRAM_DIR=$PWD/xmake
-  - build/xmake --version
+  - core/build/xmake --version
   - export XMAKE_PROGRAM_DIR=~/.local/share/xmake
-  - cp build/xmake "$XMAKE_PROGRAM_DIR" || sudo cp build/xmake "$XMAKE_PROGRAM_DIR"
+  - cp core/build/xmake "$XMAKE_PROGRAM_DIR" || sudo cp core/build/xmake "$XMAKE_PROGRAM_DIR"
   - xmake --version
   - xmake l private.utils.bcsave --rootname='@programdir' -x 'scripts/**|templates/**' xmake
   - xmake --version
@@ -35,4 +35,3 @@ script:
   - scripts/archive-all.sh
   - scripts/makeself/build-runfile.sh 
   - scripts/makeself/xmake.gz.run --info
-
diff --git a/core/xmake.lua b/core/xmake.lua
index 89abc1909..3eb575a70 100644
--- a/core/xmake.lua
+++ b/core/xmake.lua
@@ -1,3 +1,12 @@
+-- project
+set_project("xmake")
+
+-- version
+set_version("2.2.9", {build = "%Y%m%d%H%M"})
+
+-- set xmake min version
+set_xmakever("2.2.3")
+
 -- set warning all as error
 set_warnings("all", "error")
 
diff --git a/scripts/srcenv.bat b/scripts/srcenv.bat
index 93a70d1a3..974c640b9 100644
--- a/scripts/srcenv.bat
+++ b/scripts/srcenv.bat
@@ -1,4 +1,4 @@
 @echo off
-set PATH=%cd%\..\build;%PATH%
+set PATH=%cd%\..\core\build;%PATH%
 set XMAKE_PROGRAM_DIR=%cd%\..\xmake
 start cmd /k cd ..
diff --git a/scripts/srcenv.profile b/scripts/srcenv.profile
index 9a29d7324..46cb17234 100644
--- a/scripts/srcenv.profile
+++ b/scripts/srcenv.profile
@@ -1,10 +1,6 @@
 # cd projectdir
 export XMAKE_PROGRAM_DIR=`pwd`/xmake
-if [ -f `pwd`/build/xmake ]; then
-    alias xmake=`pwd`/build/xmake
-else
-    alias xmake=`pwd`/core/src/demo/demo.b
-fi
+alias xmake=`pwd`/core/src/demo/demo.b
 xmake --version
 xmake l xmake.programdir
 xmake l xmake.programfile
diff --git a/xmake.lua b/xmake.lua
deleted file mode 100644
index 6b6e92c9d..000000000
--- a/xmake.lua
+++ /dev/null
@@ -1,11 +0,0 @@
--- project
-set_project("xmake")
-
--- version
-set_version("2.2.9", {build = "%Y%m%d%H%M"})
-
--- set xmake min version
-set_xmakever("2.2.3")
-
--- only build core project
-includes("core")