Skip to content

Commit 7a86f01

Browse files
committed
Remove the java_bytecode/library/ folder
It used to have a built-in version of a library, but it's not actually needed (or used) anymore.
1 parent 2d54fe6 commit 7a86f01

File tree

6 files changed

+6
-117
lines changed

6 files changed

+6
-117
lines changed

jbmc/src/java_bytecode/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# include here the targets defined in library/
2-
add_subdirectory(library)
3-
41
# target 'java_bytecode' depends on all .cpp and .h files
52
file(GLOB sources "*.cpp")
63
file(GLOB_RECURSE headers "*.h")

jbmc/src/java_bytecode/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,17 @@ all: library java_bytecode$(LIBEXT)
6868

6969
clean: clean_library
7070

71+
LIBRARY_DIR = ../../lib/java-models-library
72+
7173
.PHONY: clean_library
7274
clean_library:
73-
$(MAKE) clean -C library
75+
if [ -d $(LIBRARY_DIR) ]; then cd $(LIBRARY_DIR); mvn --quiet clean; fi
7476

7577
.PHONY: library
7678
library:
77-
$(MAKE) -C library
79+
if [ -d $(LIBRARY_DIR) ]; then \
80+
(cd $(LIBRARY_DIR); mvn --quiet -Dmaven.test.skip=true package); \
81+
fi
7882

7983
###############################################################################
8084

jbmc/src/java_bytecode/library/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

jbmc/src/java_bytecode/library/Makefile

Lines changed: 0 additions & 37 deletions
This file was deleted.

jbmc/src/java_bytecode/library/converter.cpp

Lines changed: 0 additions & 72 deletions
This file was deleted.

jbmc/src/java_bytecode/library/module_dependencies.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)