Skip to content

Commit 5771950

Browse files
committed
Rename lfortran -> libasr in the build system
1 parent 457930b commit 5771950

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

Diff for: build0_win.xsh

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ echo @(version) > version
77
# Generate a Python AST from Python.asdl (Python)
88
python grammar/asdl_py.py
99
# Generate a Python AST from Python.asdl (C++)
10-
python lfortran/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
10+
python libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
1111
# Generate a Fortran ASR from ASR.asdl (C++)
12-
python lfortran/src/libasr/asdl_cpp.py lfortran/src/libasr/ASR.asdl lfortran/src/libasr/asr.h
13-
# Generate a wasm_visitor.h from lfortran/src/libasr/wasm_instructions.txt (C++)
14-
python lfortran/src/libasr/wasm_instructions_visitor.py
12+
python libasr/src/libasr/asdl_cpp.py libasr/src/libasr/ASR.asdl libasr/src/libasr/asr.h
13+
# Generate a wasm_visitor.h from libasr/src/libasr/wasm_instructions.txt (C++)
14+
python libasr/src/libasr/wasm_instructions_visitor.py
1515
# Generate the intrinsic_function_registry_util.h (C++)
16-
python lfortran/src/libasr/intrinsic_func_registry_util_gen.py
16+
python libasr/src/libasr/intrinsic_func_registry_util_gen.py
1717

1818
# Generate the tokenizer and parser
1919
pushd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd

Diff for: ci/build.xsh

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ llvm-config --components
2727
bash ci/version.sh
2828

2929
# Generate a Fortran ASR from ASR.asdl (C++)
30-
python lfortran/src/libasr/asdl_cpp.py lfortran/src/libasr/ASR.asdl lfortran/src/libasr/asr.h
30+
python libasr/src/libasr/asdl_cpp.py libasr/src/libasr/ASR.asdl libasr/src/libasr/asr.h
3131
# Generate a Python AST from Python.asdl (C++)
32-
python lfortran/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
32+
python libasr/src/libasr/asdl_cpp.py grammar/Python.asdl src/lpython/python_ast.h
3333
# Generate a Python AST from Python.asdl (Python)
3434
python grammar/asdl_py.py
35-
# Generate a wasm_visitor.h from lfortran/src/libasr/wasm_instructions.txt (C++)
36-
python lfortran/src/libasr/wasm_instructions_visitor.py
35+
# Generate a wasm_visitor.h from libasr/src/libasr/wasm_instructions.txt (C++)
36+
python libasr/src/libasr/wasm_instructions_visitor.py
3737
# Generate the intrinsic_function_registry_util.h (C++)
38-
python lfortran/src/libasr/intrinsic_func_registry_util_gen.py
38+
python libasr/src/libasr/intrinsic_func_registry_util_gen.py
3939

4040
# Generate the tokenizer and parser
4141
pushd src/lpython/parser && re2c -W -b tokenizer.re -o tokenizer.cpp && popd

Diff for: run_tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55

66
ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__)))
7-
sys.path.append(os.path.join(ROOT_DIR, "lfortran", "src", "libasr"))
7+
sys.path.append(os.path.join(ROOT_DIR, "libasr", "src", "libasr"))
88

99
from compiler_tester.tester import color, fg, log, run_test, style, tester_main
1010

Diff for: src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_subdirectory(${CMAKE_SOURCE_DIR}/lfortran/src/libasr ${CMAKE_BINARY_DIR}/libasr)
1+
add_subdirectory(${CMAKE_SOURCE_DIR}/libasr/src/libasr ${CMAKE_BINARY_DIR}/libasr)
22
add_subdirectory(tests)
33
add_subdirectory(lpython)
44
add_subdirectory(bin)

Diff for: src/bin/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if (WITH_STACKTRACE AND APPLE AND CMAKE_CXX_COMPILER_ID MATCHES Clang)
3333
add_custom_command(
3434
TARGET lpython
3535
POST_BUILD
36-
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../../lfortran/src/libasr/dwarf_convert.py lpython.dSYM/raw.txt lpython.dSYM/lines.txt lpython.dSYM/lines.dat
36+
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../../libasr/src/libasr/dwarf_convert.py lpython.dSYM/raw.txt lpython.dSYM/lines.txt lpython.dSYM/lines.dat
3737
)
3838
endif()
3939
endif()

Diff for: src/bin/lpython.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2261,7 +2261,7 @@ int main(int argc, char *argv[])
22612261
#else
22622262
cmd += "llvm-dwarfdump --debug-line " + basename + ".out > ";
22632263
#endif
2264-
cmd += basename + "_ldd.txt && (cd lfortran/src/libasr; ./dwarf_convert.py ../../../"
2264+
cmd += basename + "_ldd.txt && (cd libasr/src/libasr; ./dwarf_convert.py ../../../"
22652265
+ basename + "_ldd.txt ../../../" + basename + "_lines.txt ../../../"
22662266
+ basename + "_lines.dat && ./dat_convert.py ../../../"
22672267
+ basename + "_lines.dat)";

Diff for: src/lpython/utils.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ std::string get_runtime_library_header_dir()
8484
char *env_p = std::getenv("LFORTRAN_RUNTIME_LIBRARY_HEADER_DIR");
8585
if (env_p) return env_p;
8686

87-
// The header file is in lfortran/src/libasr/runtime for development, but in impure
87+
// The header file is in libasr/src/libasr/runtime for development, but in impure
8888
// in installed version
8989
std::string path;
9090
int dirname_length;
@@ -94,11 +94,11 @@ std::string get_runtime_library_header_dir()
9494
|| endswith(dirname, "src\\bin")
9595
|| endswith(dirname, "SRC\\BIN")) {
9696
// Development version
97-
return dirname + "/../../lfortran/src/libasr/runtime";
97+
return dirname + "/../../libasr/src/libasr/runtime";
9898
} else if (endswith(dirname, "src/lpython/tests") ||
9999
endswith(to_lower(dirname), "src\\lpython\\tests")) {
100100
// CTest Tests
101-
return dirname + "/../../../lfortran/src/libasr/runtime";
101+
return dirname + "/../../../libasr/src/libasr/runtime";
102102
} else {
103103
// Installed version
104104
return dirname + "/../share/lpython/lib/impure";

Diff for: src/runtime/legacy/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(SRC
2-
../../../lfortran/src/libasr/runtime/lfortran_intrinsics.c
2+
../../../libasr/src/libasr/runtime/lfortran_intrinsics.c
33
)
44
add_library(lpython_runtime SHARED ${SRC})
55
target_include_directories(lpython_runtime BEFORE PUBLIC ${libasr_SOURCE_DIR}/..)

Diff for: src/runtime/lpython/lpython.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ def get_rtlib_dir():
717717
get_python_version
718718
python_path = "-I" + get_python_inc() + " "
719719
numpy_path = "-I" + get_include() + " "
720-
rt_path_01 = "-I" + get_rtlib_dir() + "/../../lfortran/src/libasr/runtime "
720+
rt_path_01 = "-I" + get_rtlib_dir() + "/../../libasr/src/libasr/runtime "
721721
rt_path_02 = "-L" + get_rtlib_dir() + " -Wl,-rpath," \
722722
+ get_rtlib_dir() + " -llpython_runtime "
723723
python_lib = "-L" + get_python_lib() + "/../.." + f" -Wl,-rpath,{get_python_lib()+'/../..'}" + " -lpython" + \

0 commit comments

Comments
 (0)