Merge pull request #1 from tboox/repo

update

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## master (unreleased)
 
+### New features
+
+* [#68](https://github.com/tboox/xmake/issues/68): Add `$(programdir)` and `$(xmake)` builtin variables
+* add `is_host` api to get current host operating system
+* [#79](https://github.com/tboox/xmake/issues/79): Improve `xmake lua` to run interactive commands, read-eval-print (REPL)
+
+### Changes
+
+* Modify option menu color.
+* [#71](https://github.com/tboox/xmake/issues/71): Improve to map optimization flags for cl.exe
+* [#73](https://github.com/tboox/xmake/issues/73): Attempt to get executable path as xmake's program directory
+* Improve the scope of `xmake.lua` in `add_subdirs` and use independent sub-scope to avoid dirty scope
+* [#78](https://github.com/tboox/xmake/pull/78): Get terminal size in runtime and soft-wrap the help printing
+* Avoid generate `.xmake` directory if be not in project
+
+### Bugs fixed
+
+* [#67](https://github.com/tboox/xmake/issues/67): Fix `sudo make install` permission problem
+* [#70](https://github.com/tboox/xmake/issues/70): Fix check android compiler error
+* Fix temporary file path conflict
+* Fix `os.host` and `os.arch` interfaces
+* Fix interpreter bug for loading root api
+* [#77](https://github.com/tboox/xmake/pull/77): fix `cprint` no color reset eol
+
 ## v2.1.3
 
 ### New features
@@ -19,7 +43,7 @@
 * Improve check toolchains and implement delay checking
 * Add user tips when scanning and generating `xmake.lua` automatically
 
-## Bugs fixed
+### Bugs fixed
 
 * Fix error tips for checking xmake min version
 * [#60](https://github.com/tboox/xmake/issues/60): Fix self-build for macosx and windows
@@ -246,6 +270,30 @@
 
 ## master (开发中)
 
+### 新特性
+
+* [#68](https://github.com/tboox/xmake/issues/68): 增加`$(programdir)`和`$(xmake)`内建变量
+* 添加`is_host`接口去判断当前的主机环境
+* [#79](https://github.com/tboox/xmake/issues/79): 增强`xmake lua`，支持交互式解释执行
+
+### 改进
+
+* 修改菜单选项颜色
+* [#71](https://github.com/tboox/xmake/issues/71): 针对widows编译器改进优化选项映射
+* [#73](https://github.com/tboox/xmake/issues/73): 尝试获取可执行文件路径来作为xmake的脚本目录 
+* 在`add_subdirs`中的子`xmake.lua`中，使用独立子作用域，避免作用域污染导致的干扰问题
+* [#78](https://github.com/tboox/xmake/pull/78): 美化非全屏终端窗口下的`xmake --help`输出
+* 避免产生不必要的`.xmake`目录，如果不在工程中的时候
+
+### Bugs修复
+
+* [#67](https://github.com/tboox/xmake/issues/67): 修复 `sudo make install` 命令权限问题
+* [#70](https://github.com/tboox/xmake/issues/70): 修复检测android编译器错误
+* 修复临时文件路径冲突问题
+* 修复`os.host`, `os.arch`等接口
+* 修复根域api加载干扰其他子作用域问题
+* [#77](https://github.com/tboox/xmake/pull/77): 修复`cprint`色彩打印中断问题
+
 ## v2.1.3
 
 ### 新特性

CONTRIBUTING.md

@@ -44,4 +44,4 @@ try to follow these guidelines when you do so.
 * 请提交代码到`dev`分支，如果通过，我们会在特定时间合并到`master`分支上
 * 为了规范化提交日志的格式，commit消息，不要用中文，请用英文描述
 
-[1]: https://github.com/waruqi/xmake/issues
+[1]: https://github.com/tboox/xmake/issues

Makefile

@@ -31,7 +31,7 @@ ARCH 		:=$(if $(findstring android,$(PLAT)),armv7,$(ARCH))
 endif
 
 xmake_dir_install   :=$(prefix)/share/xmake
-xmake_core          :=./core/bin/demo.pkg/bin/$(PLAT)/$(ARCH)/demo.b
+xmake_core          :=./core/src/demo/demo.b
 xmake_core_install  :=$(xmake_dir_install)/xmake
 xmake_loader        :=/tmp/xmake_loader
 xmake_loader_install:=$(prefix)/bin/xmake
@@ -53,7 +53,6 @@ install:
 	@echo plat: $(PLAT)
 	@echo arch: $(ARCH)
 	@# create the xmake install directory
-	@$(MAKE) -C core --no-print-directory i
 	@if [ -d $(xmake_dir_install) ]; then rm -rf $(xmake_dir_install); fi
 	@if [ ! -d $(xmake_dir_install) ]; then mkdir -p $(xmake_dir_install); fi
 	@# install the xmake core file

README.md

@@ -12,7 +12,7 @@ so that any developer can quickly pick it up and enjoy the productivity boost wh
 If you want to known more, please refer to:
 
 * [Documents](http://xmake.io/#/home)
-* [Github](https://github.com/waruqi/xmake)
+* [Github](https://github.com/tboox/xmake)
 * [HomePage](http://www.xmake.io)
 
 ## Simple description

README_zh.md

@@ -18,7 +18,7 @@ xmake的目标是开发者更加关注于项目本身开发，简化项目的描
 如果你想要了解更多，请参考：
 
 * [在线文档](http://xmake.io/#/zh/)
-* [在线源码](https://github.com/waruqi/xmake)
+* [在线源码](https://github.com/tboox/xmake)
 * [项目主页](http://www.xmake.io/cn)
 
 ## 简单的工程描述

appveyor.yml

@@ -11,11 +11,15 @@ before_build:
   - cmd: xmake-installer.exe /S /D=C:\xmake
   - cmd: PATH=%PATH%;C:\xmake
   - cmd: xmake --version
+  - cmd: cd core
+  - cmd: xmake -v
+  - ps: cp -force build\xmake.exe C:\xmake\xmake.exe
+  - cmd: cd ..
   - ps: cp -r -force xmake\* C:\xmake
   - cmd: xmake --version
   - cmd: dir C:\xmake
 
 build_script:
   - cmd: cd core
   - cmd: if %platform%==Win64 xmake f -a x64
-  - cmd: xmake -v
+  - cmd: xmake -r -v

core/pkg/tbox.pkg/inc/linux/tbox.config.h

@@ -6,7 +6,7 @@
 #define TB_CONFIG_VERSION_MAJOR 1
 #define TB_CONFIG_VERSION_MINOR 6
 #define TB_CONFIG_VERSION_ALTER 2
-#define TB_CONFIG_VERSION_BUILD 201703291752
+#define TB_CONFIG_VERSION_BUILD 201704211356
 
 // defines
 #define TB_CONFIG_OS_LINUX 1

core/pkg/tbox.pkg/inc/macosx/tbox.config.h

@@ -6,7 +6,7 @@
 #define TB_CONFIG_VERSION_MAJOR 1
 #define TB_CONFIG_VERSION_MINOR 6
 #define TB_CONFIG_VERSION_ALTER 2
-#define TB_CONFIG_VERSION_BUILD 201703291743
+#define TB_CONFIG_VERSION_BUILD 201704210948
 
 // defines
 #define TB_CONFIG_OS_MACOSX 1

core/pkg/tbox.pkg/inc/tbox/prefix/arm64/prefix.S

@@ -30,7 +30,7 @@
 #   define ELF
 #   define EXTERN_ASM
 #else
-#   define ELF          #
+#   define ELF          //
 #   define EXTERN_ASM   _
 #endif
 

core/pkg/tbox.pkg/inc/windows/tbox.config.h

@@ -6,7 +6,7 @@
 #define TB_CONFIG_VERSION_MAJOR 1
 #define TB_CONFIG_VERSION_MINOR 6
 #define TB_CONFIG_VERSION_ALTER 2
-#define TB_CONFIG_VERSION_BUILD 201703301429
+#define TB_CONFIG_VERSION_BUILD 201704211132
 
 // defines
 #define TB_CONFIG_OS_WINDOWS 1

core/pkg/tbox.pkg/xmake.lua

@@ -1,30 +1,30 @@
-
--- the tbox package
-option("tbox")
-
-    -- show menu
-    set_showmenu(true)
-
-    -- set category
-    set_category("package")
-
-    -- set description
-    set_description("The tbox package")
-
-    -- set language: c99, c++11
-    set_languages("c99", "cxx11")
-
-    -- add defines to config.h if checking ok
-    add_defines_h_if_ok("$(prefix)_PACKAGE_HAVE_TBOX")
-
-    -- add links for checking
-    add_links("tbox")
-
-    -- add link directories
-    add_linkdirs("lib/$(mode)/$(plat)/$(arch)")
-
-    -- add c includes for checking
-    add_cincludes("tbox/tbox.h")
-
-    -- add include directories
-    add_includedirs("inc/$(plat)", "inc")
+
+-- the tbox package
+option("tbox")
+
+    -- show menu
+    set_showmenu(true)
+
+    -- set category
+    set_category("package")
+
+    -- set description
+    set_description("The tbox package")
+
+    -- set language: c99, c++11
+    set_languages("c99", "cxx11")
+
+    -- add defines to config.h if checking ok
+    add_defines_h_if_ok("$(prefix)_PACKAGE_HAVE_TBOX")
+
+    -- add links for checking
+    add_links("tbox")
+
+    -- add link directories
+    add_linkdirs("lib/$(mode)/$(plat)/$(arch)")
+
+    -- add c includes for checking
+    add_cincludes("tbox/tbox.h")
+
+    -- add include directories
+    add_includedirs("inc/$(plat)", "inc")

core/src/demo/makefile

@@ -15,10 +15,15 @@ demo_PKGS-$(TBOX)  								+= tbox
 demo_PKGS-$(BASE)  								+= base 
 
 # others
-demo_LIBS 										+= xmake$(DTYPE) luajit$(DTYPE)
+demo_LIBS 										+= xmake$(DTYPE) luajit$(DTYPE) 
 demo_INC_DIRS 									+= ../ ../luajit/src
 demo_LIB_DIRS 									+= ../xmake ../luajit
 demo_CXFLAGS 									+= -D__tb_prefix__=\"xmake\"
+
+# add readline
+ifneq ($(PLAT),windows)
+demo_LIBS 										+= readline 				
+endif
 
 # suffix
 include $(PRO_DIR)/suffix.mak

core/src/demo/xmake.lua

@@ -23,6 +23,11 @@ target("demo")
     add_links("xmake", "luajit")
     add_linkdirs("$(buildir)")
 
+    -- link readline
+    if not is_plat("windows") then
+        add_links("readline")
+    end
+
     -- add packages
     add_packages("tbox", "base")
 

core/src/xmake/hash/prefix.h

@@ -0,0 +1,36 @@
+/*!The Make-like Build Utility based on Lua
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * Copyright (C) 2015 - 2017, TBOOX Open Source Group.
+ *
+ * @author      ruki
+ * @file        prefix.h
+ *
+ */
+#ifndef XM_HASH_PREFIX_H
+#define XM_HASH_PREFIX_H
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "../prefix.h"
+
+
+#endif
+
+