michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(bin): add linja.in and LEAN_BIN_DEP cmake option

Browse source 
see the discussion in issue #422
This commit is contained in:
Soonho Kong 2015-02-04 15:58:29 -05:00 committed by Leonardo de Moura
parent dc297865d4
commit ca16381892
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -22,5 +22,3 @@ CMakeFiles/
doc/html doc/html
make.deps make.deps
src/emacs/dependencies src/emacs/dependencies
bin/leanemacs
bin/leanemacs.bat

3
bin/.gitignore vendored
View file

@ -1,4 +1,7 @@
lean lean
lean.exe lean.exe
leanemacs
leanemacs.bat
linja
python_lib/six.pyc python_lib/six.pyc
python_lib/__init__.pyc python_lib/__init__.pyc

8
bin/linja → bin/linja.in
View file

@ -102,6 +102,7 @@ g_leantags_path = "USE DEFAULT" # System will search automatically
g_ninja_path = "USE DEFAULT" # System will search automatically g_ninja_path = "USE DEFAULT" # System will search automatically
g_flycheck_header = "FLYCHECK_BEGIN" g_flycheck_header = "FLYCHECK_BEGIN"
g_flycheck_footer = "FLYCHECK_END" g_flycheck_footer = "FLYCHECK_END"
g_lean_bin_dep_flag= "@LEAN_BIN_DEP@" == "ON"
g_logger = logging.getLogger('linja_logger') g_logger = logging.getLogger('linja_logger')
g_debug_mode = False g_debug_mode = False
@ -609,9 +610,12 @@ def clear_cache(args):
def build_olean(lean, olean, clean, dlean, ilean, base): def build_olean(lean, olean, clean, dlean, ilean, base):
(lean, olean, clean, dlean, ilean, base) = list(map(escape_ninja_char, (lean, olean, clean, dlean, ilean, base))) (lean, olean, clean, dlean, ilean, base) = list(map(escape_ninja_char, (lean, olean, clean, dlean, ilean, base)))
if clean.startswith(base): if clean.startswith(base):
str = """build %s %s %s: LEAN %s | %s\n""" % (olean, ilean, clean, lean, dlean) str = """build %s %s %s: LEAN %s | %s""" % (olean, ilean, clean, lean, dlean)
else: else:
str = """build %s %s: LEAN %s | %s\n""" % (olean, ilean, lean, dlean) str = """build %s %s: LEAN %s | %s""" % (olean, ilean, lean, dlean)
if g_lean_bin_dep_flag:
str += " %s" % g_lean_path
str += "\n"
str += " DLEAN_FILE=%s\n" % dlean str += " DLEAN_FILE=%s\n" % dlean
str += " OLEAN_FILE=%s\n" % olean str += " OLEAN_FILE=%s\n" % olean
str += " CLEAN_FILE=%s\n" % clean str += " CLEAN_FILE=%s\n" % clean

5
src/CMakeLists.txt
View file

@ -33,6 +33,8 @@ option(CROSS_COMPILE "CROSS_COMPILE" OFF)
option(CONSERVE_MEMORY "CONSERVE_MEMORY" OFF) option(CONSERVE_MEMORY "CONSERVE_MEMORY" OFF)
# Include MSYS2 required DLLs and binaries in the binary distribution package # Include MSYS2 required DLLs and binaries in the binary distribution package
option(INCLUDE_MSYS2_DLLS "INCLUDE_MSYS2_DLLS" OFF) option(INCLUDE_MSYS2_DLLS "INCLUDE_MSYS2_DLLS" OFF)
# When ON we add lean binary dependency to standard and HOTT libraries
option(LEAN_BIN_DEP "LEAN_BIN_DEP" ON)
# Directory that include lean emacs mode dependecies # Directory that include lean emacs mode dependecies
set(EMACS_DEPENDENCIES "${CMAKE_SOURCE_DIR}/emacs/dependencies") set(EMACS_DEPENDENCIES "${CMAKE_SOURCE_DIR}/emacs/dependencies")
@ -299,6 +301,9 @@ configure_file("${LEAN_SOURCE_DIR}/version.h.in" "${LEAN_BINARY_DIR}/version.h")
configure_file("${LEAN_SOURCE_DIR}/../bin/leanemacs.in" "${LEAN_SOURCE_DIR}/../bin/leanemacs") configure_file("${LEAN_SOURCE_DIR}/../bin/leanemacs.in" "${LEAN_SOURCE_DIR}/../bin/leanemacs")
configure_file("${LEAN_SOURCE_DIR}/../bin/leanemacs.bat.in" "${LEAN_SOURCE_DIR}/../bin/leanemacs.bat") configure_file("${LEAN_SOURCE_DIR}/../bin/leanemacs.bat.in" "${LEAN_SOURCE_DIR}/../bin/leanemacs.bat")
# linja
configure_file("${LEAN_SOURCE_DIR}/../bin/linja.in" "${LEAN_SOURCE_DIR}/../bin/linja" @ONLY)
include_directories("${LEAN_BINARY_DIR}") include_directories("${LEAN_BINARY_DIR}")
add_subdirectory(util) add_subdirectory(util)
set(LEAN_LIBS ${LEAN_LIBS} util) set(LEAN_LIBS ${LEAN_LIBS} util)