Merge pull request #43 from elite-lang/dev

准备发布0.9.2版

Author: xssss1

.gitignore

@@ -5,6 +5,8 @@
 *.lrsave
 .clang_complete
 bin/
+lib/
+runtime/
 build/
 Lex/bin/
 Lex/build/

.travis.yml

@@ -1,12 +1,32 @@
-dist: trusty
-language: cpp
 git:
   depth: 3
 
-install:
-  - sudo apt-get update
-  - sudo apt-get install -y llvm-3.6-dev libedit-dev flex bison
-  - sudo sh ./scripts/fix_ubuntu_llvm.sh
+compiler:
+  - gcc
+  - clang
+
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+
+    - os: osx
+      osx_image: xcode7.3
+      sudo: required
+
+addons:
+  apt:
+    packages:
+      - llvm-3.6-dev
+      - libedit-dev
+      - flex
+      - bison
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install llvm flex bison; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo sh ./scripts/fix_ubuntu_llvm.sh; fi
   - sudo sh ./scripts/install_gtest.sh
   - sudo sh ./scripts/chmod_runnable.sh
 

Builder/CMakeLists.txt

@@ -2,17 +2,17 @@ cmake_minimum_required(VERSION 2.8)
 project(Builder)
 
 if(NOT BUILD_ALL) # BUILD_ALL负责确认是不是所有子项目统一配置构建
-SET (CMAKE_BUILD_TYPE Debug) 
+SET (CMAKE_BUILD_TYPE Debug)
 SET (CMAKE_CXX_COMPILER_ENV_VAR "clang++")
 SET (CMAKE_CXX_FLAGS "-std=c++11")
 SET (CMAKE_CXX_FLAGS_DEBUG   "-g")
 SET (CMAKE_CXX_FLAGS_MINSIZEREL  "-Os -DNDEBUG")
 SET (CMAKE_CXX_FLAGS_RELEASE  "-O4 -DNDEBUG")
 SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
 SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-include_directories(../Lex/include 
-					../LR_Scanner/include 
-					../RedApple/includes 
+include_directories(../Lex/include
+					../LR_Scanner/include
+					../RedApple/includes
 					../MetaScriptRunner/include
 					)
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib)
@@ -24,8 +24,8 @@ include_directories(src include ../tools)
 file(GLOB_RECURSE source_files ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 if(USE_DYNAMIC)
 	add_library(builder SHARED ${source_files}) # 使用动态库
+	install(TARGETS builder RUNTIME DESTINATION bin)
 else()
 	add_library(builder STATIC ${source_files}) # 使用静态库
+	install(TARGETS builder ARCHIVE DESTINATION lib)
 endif()
-
-

Builder/src/Builder.cpp

@@ -239,7 +239,7 @@ string Builder::make_default_name(const char* filename) {
 	str[size+2] = 'c';
 	str[size+3] = 0;
 	string s = str;
-	delete str;
+	delete[] str;
 	return s;
 }
 
@@ -281,16 +281,17 @@ int Builder::call_ld(std::string filein, std::string fileout, std::string link_a
 
 #if !defined(_WIN32) && (defined(__linux__) || defined(__APPLE__))
 	string ld = "clang++";
+#else
+	string ld = "g++";
+#endif
 	string runtime = " -L";
-	runtime += PathGetter::getEliteToolsPath();
+	runtime += PathGetter::getEliteHome();
 	runtime += "/runtime/";
+	runtime += " -L";
+	runtime += PathGetter::getEliteHome();
+	runtime += "/extlib/lib/";
 	string args = runtime + " -o " + fileout + " " + filein + link_args + " -lruntime -ldyncall_s";
 	ld += args;
 	printf("ld: %s\n", ld.c_str());
 	return system(ld.c_str());
-#endif
-#if defined(_WIN32)
-
-#endif
-	return 0;
 }

CHANGELOG.md

@@ -1,6 +1,17 @@
 Change Log
 ===============
 
+### v0.9.2
+新增添了windows下的打包
+增加了mac下的编译和测试
+
+
+### v0.9.1
+添加了新的预处理器
+添加了打包脚本
+添加了Mac平台的测试
+
+
 ### v0.9.0
 
 添加了GC系统

CMakeLists.txt

@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 2.8)
 project(Elite)
 
+SET(VERSION_MAJOR "0")
+SET(VERSION_MINOR "9")
+SET(VERSION_PATCH "2")
+
 SET (CMAKE_BUILD_TYPE Debug) # 默认构建Debug模式
 
 if(UNIX)
@@ -15,10 +19,10 @@ elseif(WIN32)
 	include(cmake/WindowsLLVM.cmake) # 寻找LLVM
 endif()
 
-
-
 ## 配置输出目录
-SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin )
+set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib )
+set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib )
 
 ## include路径配置
 include_directories(src extlib/include
@@ -44,6 +48,15 @@ add_subdirectory(RedApple)
 add_subdirectory(MetaScriptRunner)
 add_subdirectory(Builder)
 
+set_target_properties( runtime
+    PROPERTIES
+    ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/runtime"
+    LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/runtime"
+    RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/runtime"
+)
+
+
+
 file(GLOB_RECURSE source_files ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 add_executable(elite ${source_files})
 
@@ -52,20 +65,25 @@ if(UNIX)
 	set (dl_lib_link dl)
 endif()
 
-target_link_libraries(elite builder meta red scanner lex  lua exiconv
-${LLVM_LIBS} ${dl_lib_link})
-
 if (CMAKE_BUILD_TYPE EQUAL "Debug")
-	target_link_libraries(elite oolua_d)
+	set (oolua_lib oolua_d)
 else()
-	target_link_libraries(elite oolua)
+	set (oolua_lib oolua)
 endif()
 
 
+target_link_libraries(elite builder meta red scanner lex ${oolua_lib} lua exiconv iconv charsetdetect charset
+${LLVM_LIBS} ${dl_lib_link})
+
+
+
+
 ## 合并Headers
 include(cmake/CombineHeader.cmake)
 
 ## 下载第三方库
 include(cmake/ThirdPartyBuild.cmake)
 
 add_subdirectory(doc)
+
+include(cmake/Install.cmake)

ExIconv/CMakeLists.txt

@@ -13,7 +13,7 @@ SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
 
 include_directories(../extlib/include)
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../extlib/lib)
-  
+
 endif()
 
 
@@ -24,7 +24,9 @@ file(GLOB_RECURSE source_files ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 add_library(exiconv STATIC ${source_files})
 target_link_libraries(exiconv iconv charsetdetect)
 
+install(TARGETS exiconv ARCHIVE DESTINATION lib)
+
 
 if(BUILD_TEST)
     add_subdirectory(test)
-endif()
+endif()

ExIconv/include/DebugMsg.h

@@ -38,6 +38,8 @@ class DebugMsg
     static std::ostream& lex_dbg();
     static void lex_close();
 
+    static std::ostream& lex_save();
+    static void lex_save_close();
     /**
      * @brief 获取解析器的debug输出文件流
      */

ExIconv/src/DebugMsg.cpp

@@ -18,8 +18,11 @@ class DebugMsg_Private
 	bool is_debug_mode;
 
 	fstream lex_dbg_fs;
+	fstream lex_save_fs;
+
 	fstream parser_dbg_fs;
 	fstream parser_save_fs;
+
 	fstream red_dbg_fs;
 
 	fstream lex_graphviz_fs;
@@ -65,6 +68,20 @@ void DebugMsg::lex_close() {
 	fs.close();
 }
 
+std::ostream& DebugMsg::lex_save() {
+	auto& fs = getInstance()->lex_save_fs;
+	if(!fs.is_open()) {
+		fs.open(getInstance()->dbg_file_path+"/parser.json", std::ios::out);
+	}
+	return fs;
+}
+
+void DebugMsg::lex_save_close() {
+	auto& fs = getInstance()->lex_save_fs;
+	fs.close();
+}
+
+
 /**
  * @brief 获取解析器的debug输出文件流
  */

ExIconv/test/CMakeLists.txt

@@ -1,13 +1,15 @@
 enable_testing()
 find_package(GTest REQUIRED)
 
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}) 
+include(../../cmake/ClangConf.cmake)
+
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 include_directories (${GTEST_INCLUDE_DIRS})
 file(GLOB_RECURSE test_source_files ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
 add_executable (estring_test ${test_source_files})
 
-target_link_libraries(estring_test exiconv iconv charsetdetect ${GTEST_BOTH_LIBRARIES} pthread)
+target_link_libraries(estring_test exiconv iconv charsetdetect charset ${GTEST_BOTH_LIBRARIES} pthread)
 
 add_test(EstringTest estring_test)
 
@@ -16,4 +18,4 @@ add_custom_target( runtest ALL
 
 add_custom_command(TARGET runtest
                    POST_BUILD
-                   COMMAND estring_test)
+                   COMMAND estring_test)