From 669cde8a87d88ceae89e369c1d38b88c9f8198cf Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 25 Dec 2012 14:19:19 -0800 Subject: Move libaltos to top level This will let it be shared by the new MicroPeak gui Signed-off-by: Keith Packard --- libaltos/Makefile-standalone | 126 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 libaltos/Makefile-standalone (limited to 'libaltos/Makefile-standalone') diff --git a/libaltos/Makefile-standalone b/libaltos/Makefile-standalone new file mode 100644 index 00000000..4e438050 --- /dev/null +++ b/libaltos/Makefile-standalone @@ -0,0 +1,126 @@ +OS:=$(shell uname) + +# +# Linux +# +ifeq ($(OS),Linux) + +JAVA_CFLAGS=-I/usr/lib/jvm/java-6-openjdk/include + +OS_LIB_CFLAGS=-DLINUX -DPOSIX_TTY $(JAVA_CFLAGS) + +OS_APP_CFLAGS=$(OS_LIB_CFLAGS) + +OS_LDFLAGS= + +LIBNAME=libaltos.so +EXEEXT= +endif + +# +# Darwin (Mac OS X) +# +ifeq ($(OS),Darwin) + +OS_LIB_CFLAGS=\ + -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \ + --sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \ + -iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \ + -iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \ + -iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers +OS_APP_CFLAGS=$(OS_LIB_CFLAGS) + +OS_LDFLAGS =\ + -framework IOKit -framework CoreFoundation + +LIBNAME=libaltos.dylib +EXEEXT= + +endif + +# +# Windows +# +ifneq (,$(findstring MINGW,$(OS))) + +CC=gcc + +OS_LIB_CFLAGS = -DWINDOWS -mconsole -DBUILD_DLL +OS_APP_CFLAGS = -DWINDOWS -mconsole + +OS_LDFLAGS = -lgdi32 -luser32 -lcfgmgr32 -lsetupapi -lole32 \ + -ladvapi32 -lcomctl32 -mconsole -Wl,--add-stdcall-alias + +LIBNAME=altos.dll + +EXEEXT=.exe + +endif + +.SUFFIXES: .java .class + +CLASSPATH=".:jnitest/*:libaltosJNI:/usr/share/java/*" + +SWIG_DIR=swig_bindings/java +SWIG_FILE=$(SWIG_DIR)/libaltos.swig +SWIG_WRAP=$(SWIG_DIR)/libaltos_wrap.c + +JNI_DIR=libaltosJNI +JNI_FILE=$(JNI_DIR)/libaltosJNI.java +JNI_SRCS=$(JNI_FILE) \ + $(JNI_DIR)/SWIGTYPE_p_altos_file.java \ + $(JNI_DIR)/SWIGTYPE_p_altos_list.java \ + $(JNI_DIR)/altos_device.java \ + $(JNI_DIR)/libaltos.java + +JAVAFILES=\ + $(JNI_SRCS) + +CLASSFILES = $(JAVAFILES:%.java=%.class) + +JAVAFLAGS=-Xlint:unchecked + +CJNITEST=cjnitest$(EXEEXT) + +all: $(LIBNAME) $(CJNITEST) $(CLASSFILES) + +.java.class: + javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java + +CFLAGS=$(OS_LIB_CFLAGS) -O -I. + +LDFLAGS=$(OS_LDFLAGS) + +HEADERS=libaltos.h +SRCS = libaltos.c $(SWIG_WRAP) +OBJS = $(SRCS:%.c=%.o) +LIBS = $(DARWIN_LIBS) + +$(CJNITEST): cjnitest.c $(LIBNAME) + $(CC) -o $@ $(OS_APP_CFLAGS) cjnitest.c $(LIBNAME) $(LIBS) $(LDFLAGS) + +$(LIBNAME): $(OBJS) + $(CC) -shared $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS) + +clean: + rm -f $(CLASSFILES) $(OBJS) $(LIBNAME) $(CJNITEST) cjnitest.o + rm -rf swig_bindings libaltosJNI + +distclean: clean + +$(JNI_FILE): libaltos.i0 $(HEADERS) + mkdir -p $(SWIG_DIR) + mkdir -p libaltosJNI + sed 's;//%;%;' libaltos.i0 $(HEADERS) > $(SWIG_FILE) + swig -java -package libaltosJNI $(SWIG_FILE) + cp swig_bindings/java/*.java libaltosJNI + +$(SWIG_WRAP): $(JNI_FILE) + +ifeq ($(OS),Linux) +install: $(LIBNAME) + install -c $(LIBNAME) $(DESTDIR)/usr/lib/altos/$(LIBNAME) + +endif + +.NOTPARALLEL: -- cgit v1.2.3 From 0f05b1996122b6c6bce81ca33e85c2a65c3ded18 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 6 Jan 2013 12:52:25 -0800 Subject: micropeak: Create Mac OS X package Includes the FTDI driver and the MicroPeak app Signed-off-by: Keith Packard --- libaltos/Makefile-standalone | 15 ++++++- libaltos/libaltos.dylib | Bin 41648 -> 41596 bytes micropeak/FTDI.tar.gz | Bin 0 -> 251029 bytes micropeak/Info.plist | 45 --------------------- micropeak/Info.plist.in | 7 +++- micropeak/Makefile.am | 4 +- .../Contents/Resources/AltosUIIcon.icns | Bin 129010 -> 0 bytes .../Contents/Resources/MicroPeak.icns | Bin 0 -> 133711 bytes 8 files changed, 22 insertions(+), 49 deletions(-) create mode 100644 micropeak/FTDI.tar.gz delete mode 100644 micropeak/Info.plist delete mode 100644 micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns create mode 100644 micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns (limited to 'libaltos/Makefile-standalone') diff --git a/libaltos/Makefile-standalone b/libaltos/Makefile-standalone index 4e438050..a1f9f5bc 100644 --- a/libaltos/Makefile-standalone +++ b/libaltos/Makefile-standalone @@ -22,9 +22,20 @@ endif # ifeq ($(OS),Darwin) +#OS_LIB_CFLAGS=\ +# -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \ +# --sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \ +# -iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \ +# -iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \ +# -iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers + +XCODE=/Applications/Xcode.app +SDK=$(XCODE)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk +MINVERSION=10.5 + OS_LIB_CFLAGS=\ - -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \ - --sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \ + -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 -isysroot $(SDK) \ + -mmacosx-version-min=10.5 \ -iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \ -iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \ -iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers diff --git a/libaltos/libaltos.dylib b/libaltos/libaltos.dylib index 1038817d..cfbd3f54 100755 Binary files a/libaltos/libaltos.dylib and b/libaltos/libaltos.dylib differ diff --git a/micropeak/FTDI.tar.gz b/micropeak/FTDI.tar.gz new file mode 100644 index 00000000..cd08ecf2 Binary files /dev/null and b/micropeak/FTDI.tar.gz differ diff --git a/micropeak/Info.plist b/micropeak/Info.plist deleted file mode 100644 index 5705cc1a..00000000 --- a/micropeak/Info.plist +++ /dev/null @@ -1,45 +0,0 @@ - - - - - CFBundleName - MicroPeak - CFBundleVersion - 1.1.9.2 - CFBundleAllowMixedLocalizations - true - CFBundleExecutable - JavaApplicationStub - CFBundleDevelopmentRegion - English - CFBundlePackageType - APPL - CFBundleIdentifier - org.altusmetrum.altosui - CFBundleSignature - Altu - CFBundleGetInfoString - MicroPeak UI version 1.1.9.2 - CFBundleInfoDictionaryVersion - 6.0 - CFBundleIconFile - MicroPeak.icns - Java - - MainClass - org.altusmetrum.micropeak.MicroPeak - JVMVersion - 1.5+ - ClassPath - - $JAVAROOT/micropeak.jar - - VMOptions - - -Xms512M - -Xmx512M - -Dosgi.clean=true - - - - diff --git a/micropeak/Info.plist.in b/micropeak/Info.plist.in index d3c17a49..40984c5a 100644 --- a/micropeak/Info.plist.in +++ b/micropeak/Info.plist.in @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleIdentifier - org.altusmetrum.altosui + org.altusmetrum.micropeak CFBundleSignature Altu CFBundleGetInfoString @@ -34,6 +34,11 @@ $JAVAROOT/micropeak.jar + Properties + + apple.laf.useScreenMenuBar + true + VMOptions -Xms512M diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index 19b23a0f..38945e82 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -88,7 +88,8 @@ LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) LINUX_EXTRA=micropeak-fat MACOSX_INFO_PLIST=Info.plist -MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) +MACOSX_DRIVER=FTDI.tar.gz +MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON) @@ -212,6 +213,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) mkdir macosx cp -a MicroPeak.app macosx/ cp -p Info.plist macosx/MicroPeak.app/Contents + tar xzf $(MACOSX_DRIVER) -C macosx mkdir -p macosx/MicroPeak.app/Contents/Resources/Java cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar cp -p libaltos.dylib macosx/MicroPeak.app/Contents/Resources/Java diff --git a/micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns b/micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns deleted file mode 100644 index fe49f362..00000000 Binary files a/micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns and /dev/null differ diff --git a/micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns b/micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns new file mode 100644 index 00000000..9ba83bf5 Binary files /dev/null and b/micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns differ -- cgit v1.2.3