From 43e2275250d9c91560a770942f3c06a8f74ed501 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 12 Aug 2017 01:37:07 -0400 Subject: install: Add 'fat-install' target This uses the existing --with-fat-dir option and instead of installing everything to that directory, creates a normal ikiwiki hierarchy of files including .mdwn files, whacked release notes html files and all of the appropriate packages. One stop shopping for adding the release to the web site. Attempted to update Releasing file to match. Signed-off-by: Keith Packard --- micropeak/Makefile.am | 35 ++++++++++++++++++++++++----------- micropeak/mdwn.tmpl | 7 +++++++ 2 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 micropeak/mdwn.tmpl (limited to 'micropeak') diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index 52b62358..6f674b19 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -95,7 +95,7 @@ desktopdir = $(datadir)/applications desktop_file = altusmetrum-micropeak.desktop desktop_SCRIPTS = $(desktop_file) -all-local: micropeak-test micropeak-jdb $(JAR) +all-local: micropeak-test micropeak-jdb $(JAR) $(MDWN) clean-local: -rm -rf classes $(JAR) $(FATJAR) \ @@ -103,7 +103,7 @@ clean-local: altoslib_*.jar altosuilib_*.jar \ $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \ micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \ - micropeak-windows.nsi *.desktop + micropeak-windows.nsi *.desktop $(MDWN) EXTRA_DIST = $(desktop_file).in @@ -115,6 +115,8 @@ LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2 LINUX_SH=MicroPeak-Linux-$(VERSION).sh MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg WINDOWS_DIST=MicroPeak-Windows-$(VERSION_DASH).exe +MDWN=$(VERSION).mdwn +MDWNTMPL=mdwn.tmpl MICROPEAK_DOC=$(top_srcdir)/doc/micropeak.pdf @@ -153,18 +155,17 @@ WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICONS) $(WINDO if FATINSTALL -FATTARGET=$(FATDIR)/$(VERSION) +FATTARGET=$(FATDIR)/MicroPeak/releases/$(VERSION) -LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST) LINUX_SH_TARGET=$(FATTARGET)/$(LINUX_SH) MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST) WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST) +MDWN_TARGET=$(FATDIR)/MicroPeak/releases/$(MDWN) +RELNOTES=release-notes-$(VERSION).html +RELNOTES_SRC=$(top_builddir)/doc/$(RELNOTES) +RELNOTES_TARGET=$(FATTARGET)/$(RELNOTES) -fat: $(LINUX_DIST_TARGET) $(LINUX_SH_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET) - -$(LINUX_DIST_TARGET): $(LINUX_DIST) - mkdir -p $(FATTARGET) - cp -p $< $@ +fat-install: $(LINUX_SH_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET) $(MDWN_TARGET) $(RELNOTES_TARGET) $(LINUX_SH_TARGET): $(LINUX_SH) mkdir -p $(FATTARGET) @@ -178,10 +179,22 @@ $(WINDOWS_DIST_TARGET): $(WINDOWS_DIST) mkdir -p $(FATTARGET) cp -p $< $@ -else -fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST) +$(MDWN_TARGET): $(MDWN) + mkdir -p $(FATTARGET) + cp -p $< $@ + +$(RELNOTES_TARGET): $(RELNOTES_SRC) + mkdir -p $(FATTARGET) + sh $(top_srcdir)/doc/install-html -d $(FATTARGET) $(RELNOTES_SRC) + endif +$(MDWN): $(MDWNTMPL) + sed -e 's/%version%/$(VERSION)/g' -e 's/%version_dash%/$(VERSION_DASH)/g' $(MDWNTMPL) > $@ + +fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST) + + micropeak: Makefile echo "#!/bin/sh" > $@ echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(micropeakdir)/micropeak.jar" "$$@"' >> $@ diff --git a/micropeak/mdwn.tmpl b/micropeak/mdwn.tmpl new file mode 100644 index 00000000..232dde5b --- /dev/null +++ b/micropeak/mdwn.tmpl @@ -0,0 +1,7 @@ +[[!inline pages="./%version%/release-notes-%version%.html" rss="no" raw="yes" ]] + +- Available Files: + - [Windows Installer](/MicroPeak/releases/%version%/MicroPeak-Windows-%version_dash%.exe) + - [Mac OS X Package](/MicroPeak/releases/%version%/MicroPeak-Mac-%version%.dmg) + - [Linux](/MicroPeak/releases/%version%/MicroPeak-Linux-%version%.sh) + - [Source Snapshot](http://git.gag.com/?p=fw/altos;a=snapshot;h=refs/tags/%version%;sf=tgz) -- cgit v1.2.3 From 3dde7f4d05414ac4907c91c68c88cc1d06233605 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 26 Aug 2017 19:14:10 -0700 Subject: micropeak: Track font changes in raw data display Signed-off-by: Keith Packard --- micropeak/MicroPeak.java | 1 + micropeak/MicroRaw.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'micropeak') diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java index 607bf20c..749d0f64 100644 --- a/micropeak/MicroPeak.java +++ b/micropeak/MicroPeak.java @@ -262,6 +262,7 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene @Override public void windowClosing(WindowEvent e) { statsTable.tell_closing(); + raw.tell_closing(); Close(); } }); diff --git a/micropeak/MicroRaw.java b/micropeak/MicroRaw.java index d1d5d076..7a60499e 100644 --- a/micropeak/MicroRaw.java +++ b/micropeak/MicroRaw.java @@ -24,7 +24,11 @@ import javax.swing.*; import org.altusmetrum.altoslib_12.*; import org.altusmetrum.altosuilib_12.*; -public class MicroRaw extends JTextArea { +public class MicroRaw extends JTextArea implements AltosFontListener { + + public void font_size_changed(int font_size) { + setFont(AltosUILib.table_value_font); + } public void setData(MicroData data) { StringWriter sw = new StringWriter(); @@ -38,9 +42,14 @@ public class MicroRaw extends JTextArea { setCaretPosition(0); } + public void tell_closing() { + AltosUIPreferences.unregister_font_listener(this); + } + public MicroRaw() { super(1, 30); setFont(AltosUILib.table_value_font); setEditable(false); + AltosUIPreferences.register_font_listener(this); } } -- cgit v1.2.3