diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2025-04-30 22:21:28 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2025-04-30 22:23:08 +0200 |
| commit | b591061ec982ea087488afe39ce55fff6fa4bfa4 (patch) | |
| tree | aa6c1351e5648a6438f440829551dcb8f513bf99 /Makefile | |
| parent | 714b07ea2012a880e0bee2ec6e090324500fa06a (diff) | |
merge project portfolio2 into bachelorizer, except class myDB
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 11 insertions, 12 deletions
@@ -2,19 +2,17 @@ DOCUMENTS = delivery1 delivery2 JAVA_PROJECTMODULES = \ com.example.portfolio2 com.example.portfolio3 dk.biks.bachelorizer -JAVA_MODULEPATHS_portfolio2 = \ - /usr/share/openjfx/lib /usr/share/java/sqlite-jdbc.jar -JAVA_MODULES_portfolio2 = $(addprefix javafx.,base controls graphics) +JAVA_MODULEPATHS_portfolio2 = /usr/share/java/sqlite-jdbc.jar JAVA_ROOT_portfolio2 = src/com.example.portfolio2 -JAVA_MAINCLASSES_portfolio2 = Main -JAVA_EXTRACLASSES_portfolio2 = Controller Database GUI MyDB UI Window +JAVA_EXTRACLASSES_portfolio2 = MyDB JAVA_ROOT_portfolio3 = src/com.example.portfolio3 JAVA_EXTRACLASSES_portfolio3 = AbstractGraph AdjListGraph AdjMapGraph \ Edge EdgeGraph GraphAlgorithms Graph Graphs MatrixGraph Vertex -JAVA_MODULEPATHS_bachelorizer = /usr/share/openjfx/lib +JAVA_MODULEPATHS_bachelorizer = \ + /usr/share/openjfx/lib /usr/share/java/sqlite-jdbc.jar JAVA_ROOT_bachelorizer = src/dk.biks.bachelorizer JAVA_MAINCLASSES_bachelorizer = Main Graph Window -JAVA_EXTRACLASSES_bachelorizer = Controller GUI Person +JAVA_EXTRACLASSES_bachelorizer = Controller Database GUI Person UI JAVA_MODULES_bachelorizer = $(addprefix javafx.,base controls graphics) ZIPNAME = bachelorizer @@ -23,8 +21,7 @@ ZIPFILES += $(STEMS:=.java) include _make/*.mk # silence security restriction warning -JAVAFLAGS += --enable-native-access=javafx.graphics -JAVAFLAGS_portfolio2 += --enable-native-access=javafx.graphics \ +JAVAFLAGS += --enable-native-access=javafx.graphics \ --enable-native-access=sqlite.jdbc # silence unsafe memory-access methods warning on recent JDKs @@ -35,11 +32,13 @@ endif # loading as modules works with JDK 22+, and is required with JDK 23+ ifeq ($(shell expr $(JAVA_MAJOR_VERSION) \>= 22), 1) -JAVA_MODULEPATHS_bachelorizer += mods/com.example.portfolio3 +JAVA_MODULEPATHS_bachelorizer += \ + mods/com.example.portfolio2 mods/com.example.portfolio3 else -JAVA_CLASSPATHS_bachelorizer += mods/com.example.portfolio3 +JAVA_CLASSPATHS_bachelorizer += \ + mods/com.example.portfolio2 mods/com.example.portfolio3 endif # TODO: fix properly declare and resolve local interdependencies runsrc-dk.biks.bachelorizer build-dk.biks.bachelorizer: \ - build-com.example.portfolio3 + build-com.example.portfolio2 build-com.example.portfolio3 |