altoslibdir=$(libdir)/altos
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(FREETTS)/*:/usr/share/java/*"
+# tmarble: attempt to use specific build deps
+# CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:/usr/share/java/jcommon.jar:/usr/share/java/jfreechart.jar:/usr/share/java/freetts.jar"
bin_SCRIPTS=altosui
AltosHexfile.java \
Altos.java \
AltosIdleMonitorUI.java \
- AltosIgnite.java \
AltosIgniteUI.java \
AltosLaunch.java \
AltosLaunchUI.java \
libaltos.dylib \
altos.dll
-JAR=altosui.jar
+JAR=AltosUI.jar
-FATJAR=altosui-fat.jar
+FATJAR=AltosUI-fat.jar
# Icons
ICONDIR=$(top_srcdir)/icon
ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
TELEMETRY_DOC=$(top_srcdir)/doc/telemetry.pdf
-TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf $(top_srcdir)/doc/megametrum-outline.pdf
DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
LINUX_EXTRA=altosui-fat
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib
+MACOSX_INFO_PLIST=Info.plist
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
MACOSX_EXTRA=$(FIRMWARE)
WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
-all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
+all-local: classes/AltosUI $(JAR) altosui altosui-test altosui-jdb
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
altosuidir=$(datadir)/java
-install-altosuiJAVA: altosui.jar
+install-altosuiJAVA: AltosUI.jar
@$(NORMAL_INSTALL)
test -z "$(altosuidir)" || $(MKDIR_P) "$(DESTDIR)$(altosuidir)"
- echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/altosui.jar'"; \
+ echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/AltosUI.jar'"; \
$(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuidir)"
-classes/altosui:
- mkdir -p classes/altosui
+classes/AltosUI:
+ mkdir -p classes/AltosUI
$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON) $(ALTOSLIB_CLASS)
jar cfm $@ Manifest.txt \
$(ICONJAR) \
- -C classes altosui \
+ -C classes AltosUI \
-C libaltos libaltosJNI
$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON)
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
- -C classes altosui \
+ -C classes AltosUI \
-C libaltos libaltosJNI
Manifest.txt: Makefile
- echo 'Main-Class: altosui.AltosUI' > $@
+ echo 'Main-Class: AltosUI.AltosUI' > $@
echo "Class-Path: AltosLib.jar $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
Manifest-fat.txt:
- echo 'Main-Class: altosui.AltosUI' > $@
+ echo 'Main-Class: AltosUI.AltosUI' > $@
echo "Class-Path: AltosLib.jar freetts.jar jfreechart.jar jcommon.jar" >> $@
altosui: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
+ echo 'exec java -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/AltosUI.jar" "$$@"' >> $@
chmod +x $@
altosui-test: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "./*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+ echo 'exec java -cp "./*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar AltosUI.jar "$$@"' >> $@
chmod +x $@
altosui-jdb: Makefile
-rm -rf macosx
mkdir macosx
cp -a AltosUI.app macosx/
+ cp -p Info.plist macosx/AltosUI.app/Contents
mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
cp -p libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java