From 3fbefb3eea981d34a09496cf8abf0119de2e35bf Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 24 Nov 2010 14:57:57 -0800 Subject: [PATCH] Move altosui to the top level, placing libaltos inside it. Signed-off-by: Keith Packard --- {ao-tools/altosui => altosui}/.gitignore | 0 .../01altosui-contents.xml | 0 .../01altosui.xml | 0 .../index.xml | 0 {ao-tools/altosui => altosui}/Altos.java | 0 {ao-tools/altosui => altosui}/AltosAscent.java | 0 .../altosui => altosui}/AltosCRCException.java | 0 {ao-tools/altosui => altosui}/AltosCSV.java | 0 {ao-tools/altosui => altosui}/AltosCSVUI.java | 0 .../altosui => altosui}/AltosChannelMenu.java | 0 {ao-tools/altosui => altosui}/AltosConfig.java | 0 .../altosui => altosui}/AltosConfigUI.java | 0 .../altosui => altosui}/AltosConfigureUI.java | 0 .../altosui => altosui}/AltosConvert.java | 0 .../altosui => altosui}/AltosDataChooser.java | 0 .../altosui => altosui}/AltosDataPoint.java | 0 .../AltosDataPointReader.java | 0 {ao-tools/altosui => altosui}/AltosDebug.java | 0 .../altosui => altosui}/AltosDescent.java | 0 {ao-tools/altosui => altosui}/AltosDevice.java | 0 .../altosui => altosui}/AltosDeviceDialog.java | 0 .../AltosDisplayThread.java | 0 .../AltosEepromDownload.java | 0 .../AltosEepromIterable.java | 0 .../AltosEepromMonitor.java | 0 .../altosui => altosui}/AltosEepromRecord.java | 0 {ao-tools/altosui => altosui}/AltosFile.java | 0 {ao-tools/altosui => altosui}/AltosFlash.java | 0 .../altosui => altosui}/AltosFlashUI.java | 0 .../AltosFlightDisplay.java | 0 .../AltosFlightInfoTableModel.java | 0 .../altosui => altosui}/AltosFlightReader.java | 0 .../altosui => altosui}/AltosFlightStatus.java | 0 .../AltosFlightStatusTableModel.java | 0 .../altosui => altosui}/AltosFlightUI.java | 0 {ao-tools/altosui => altosui}/AltosGPS.java | 0 {ao-tools/altosui => altosui}/AltosGraph.java | 0 .../altosui => altosui}/AltosGraphTime.java | 0 .../altosui => altosui}/AltosGraphUI.java | 0 .../altosui => altosui}/AltosGreatCircle.java | 0 .../altosui => altosui}/AltosHexfile.java | 0 {ao-tools/altosui => altosui}/AltosIgnite.java | 0 .../altosui => altosui}/AltosIgniteUI.java | 0 .../altosui => altosui}/AltosInfoTable.java | 0 {ao-tools/altosui => altosui}/AltosKML.java | 0 {ao-tools/altosui => altosui}/AltosLanded.java | 0 {ao-tools/altosui => altosui}/AltosLed.java | 0 {ao-tools/altosui => altosui}/AltosLights.java | 0 {ao-tools/altosui => altosui}/AltosLine.java | 0 {ao-tools/altosui => altosui}/AltosLog.java | 0 {ao-tools/altosui => altosui}/AltosPad.java | 0 {ao-tools/altosui => altosui}/AltosParse.java | 0 .../altosui => altosui}/AltosPreferences.java | 0 {ao-tools/altosui => altosui}/AltosReader.java | 0 {ao-tools/altosui => altosui}/AltosRecord.java | 0 .../AltosRecordIterable.java | 0 .../altosui => altosui}/AltosReplayReader.java | 0 .../altosui => altosui}/AltosRomconfig.java | 0 .../altosui => altosui}/AltosRomconfigUI.java | 0 {ao-tools/altosui => altosui}/AltosSerial.java | 0 .../AltosSerialInUseException.java | 0 .../AltosSerialMonitor.java | 0 .../altosui => altosui}/AltosSiteMap.java | 0 .../altosui => altosui}/AltosSiteMapCache.java | 0 .../altosui => altosui}/AltosSiteMapTile.java | 0 {ao-tools/altosui => altosui}/AltosState.java | 0 .../altosui => altosui}/AltosTelemetry.java | 0 .../AltosTelemetryIterable.java | 0 .../AltosTelemetryReader.java | 0 .../AltosUI.app/Contents/Info.plist | 0 .../Contents/MacOS/JavaApplicationStub | Bin .../AltosUI.app/Contents/PkgInfo | 0 .../Contents/Resources/AltosUIIcon.icns | Bin {ao-tools/altosui => altosui}/AltosUI.java | 0 {ao-tools/altosui => altosui}/AltosVoice.java | 0 {ao-tools/altosui => altosui}/AltosWriter.java | 0 {ao-tools/altosui => altosui}/GrabNDrag.java | 0 .../Instdrv/NSIS/Contrib/InstDrv/Example.nsi | 0 .../NSIS/Contrib/InstDrv/InstDrv-Test.exe | Bin .../Instdrv/NSIS/Contrib/InstDrv/InstDrv.c | 0 .../Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp | 0 .../Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw | 0 .../Instdrv/NSIS/Contrib/InstDrv/Readme.txt | 0 .../Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf | 0 .../Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys | Bin .../Instdrv/NSIS/Plugins/InstDrv.dll | Bin .../altosui => altosui}/Makefile-standalone | 0 {ao-tools/altosui => altosui}/Makefile.am | 17 +++++++++-------- .../altosui => altosui}/altos-windows.nsi | 0 {ao-tools/altosui => altosui}/altosui-fat | 0 {ao-tools/altosui => altosui}/altosui.1 | 0 {ao-tools/altosui => altosui}/altusmetrum.jpg | Bin {ao-tools => altosui}/libaltos/.gitignore | 0 .../libaltos/Makefile-standalone | 0 {ao-tools => altosui}/libaltos/Makefile.am | 0 {ao-tools => altosui}/libaltos/altos.dll | Bin {ao-tools => altosui}/libaltos/cjnitest.c | 0 {ao-tools => altosui}/libaltos/libaltos.c | 0 {ao-tools => altosui}/libaltos/libaltos.dylib | Bin {ao-tools => altosui}/libaltos/libaltos.h | 0 {ao-tools => altosui}/libaltos/libaltos.i0 | 0 ao-tools/Makefile.am | 2 +- configure.ac | 4 ++-- 103 files changed, 12 insertions(+), 11 deletions(-) rename {ao-tools/altosui => altosui}/.gitignore (100%) rename {ao-tools/altosui => altosui}/AltOS Package Configuration.pmdoc/01altosui-contents.xml (100%) rename {ao-tools/altosui => altosui}/AltOS Package Configuration.pmdoc/01altosui.xml (100%) rename {ao-tools/altosui => altosui}/AltOS Package Configuration.pmdoc/index.xml (100%) rename {ao-tools/altosui => altosui}/Altos.java (100%) rename {ao-tools/altosui => altosui}/AltosAscent.java (100%) rename {ao-tools/altosui => altosui}/AltosCRCException.java (100%) rename {ao-tools/altosui => altosui}/AltosCSV.java (100%) rename {ao-tools/altosui => altosui}/AltosCSVUI.java (100%) rename {ao-tools/altosui => altosui}/AltosChannelMenu.java (100%) rename {ao-tools/altosui => altosui}/AltosConfig.java (100%) rename {ao-tools/altosui => altosui}/AltosConfigUI.java (100%) rename {ao-tools/altosui => altosui}/AltosConfigureUI.java (100%) rename {ao-tools/altosui => altosui}/AltosConvert.java (100%) rename {ao-tools/altosui => altosui}/AltosDataChooser.java (100%) rename {ao-tools/altosui => altosui}/AltosDataPoint.java (100%) rename {ao-tools/altosui => altosui}/AltosDataPointReader.java (100%) rename {ao-tools/altosui => altosui}/AltosDebug.java (100%) rename {ao-tools/altosui => altosui}/AltosDescent.java (100%) rename {ao-tools/altosui => altosui}/AltosDevice.java (100%) rename {ao-tools/altosui => altosui}/AltosDeviceDialog.java (100%) rename {ao-tools/altosui => altosui}/AltosDisplayThread.java (100%) rename {ao-tools/altosui => altosui}/AltosEepromDownload.java (100%) rename {ao-tools/altosui => altosui}/AltosEepromIterable.java (100%) rename {ao-tools/altosui => altosui}/AltosEepromMonitor.java (100%) rename {ao-tools/altosui => altosui}/AltosEepromRecord.java (100%) rename {ao-tools/altosui => altosui}/AltosFile.java (100%) rename {ao-tools/altosui => altosui}/AltosFlash.java (100%) rename {ao-tools/altosui => altosui}/AltosFlashUI.java (100%) rename {ao-tools/altosui => altosui}/AltosFlightDisplay.java (100%) rename {ao-tools/altosui => altosui}/AltosFlightInfoTableModel.java (100%) rename {ao-tools/altosui => altosui}/AltosFlightReader.java (100%) rename {ao-tools/altosui => altosui}/AltosFlightStatus.java (100%) rename {ao-tools/altosui => altosui}/AltosFlightStatusTableModel.java (100%) rename {ao-tools/altosui => altosui}/AltosFlightUI.java (100%) rename {ao-tools/altosui => altosui}/AltosGPS.java (100%) rename {ao-tools/altosui => altosui}/AltosGraph.java (100%) rename {ao-tools/altosui => altosui}/AltosGraphTime.java (100%) rename {ao-tools/altosui => altosui}/AltosGraphUI.java (100%) rename {ao-tools/altosui => altosui}/AltosGreatCircle.java (100%) rename {ao-tools/altosui => altosui}/AltosHexfile.java (100%) rename {ao-tools/altosui => altosui}/AltosIgnite.java (100%) rename {ao-tools/altosui => altosui}/AltosIgniteUI.java (100%) rename {ao-tools/altosui => altosui}/AltosInfoTable.java (100%) rename {ao-tools/altosui => altosui}/AltosKML.java (100%) rename {ao-tools/altosui => altosui}/AltosLanded.java (100%) rename {ao-tools/altosui => altosui}/AltosLed.java (100%) rename {ao-tools/altosui => altosui}/AltosLights.java (100%) rename {ao-tools/altosui => altosui}/AltosLine.java (100%) rename {ao-tools/altosui => altosui}/AltosLog.java (100%) rename {ao-tools/altosui => altosui}/AltosPad.java (100%) rename {ao-tools/altosui => altosui}/AltosParse.java (100%) rename {ao-tools/altosui => altosui}/AltosPreferences.java (100%) rename {ao-tools/altosui => altosui}/AltosReader.java (100%) rename {ao-tools/altosui => altosui}/AltosRecord.java (100%) rename {ao-tools/altosui => altosui}/AltosRecordIterable.java (100%) rename {ao-tools/altosui => altosui}/AltosReplayReader.java (100%) rename {ao-tools/altosui => altosui}/AltosRomconfig.java (100%) rename {ao-tools/altosui => altosui}/AltosRomconfigUI.java (100%) rename {ao-tools/altosui => altosui}/AltosSerial.java (100%) rename {ao-tools/altosui => altosui}/AltosSerialInUseException.java (100%) rename {ao-tools/altosui => altosui}/AltosSerialMonitor.java (100%) rename {ao-tools/altosui => altosui}/AltosSiteMap.java (100%) rename {ao-tools/altosui => altosui}/AltosSiteMapCache.java (100%) rename {ao-tools/altosui => altosui}/AltosSiteMapTile.java (100%) rename {ao-tools/altosui => altosui}/AltosState.java (100%) rename {ao-tools/altosui => altosui}/AltosTelemetry.java (100%) rename {ao-tools/altosui => altosui}/AltosTelemetryIterable.java (100%) rename {ao-tools/altosui => altosui}/AltosTelemetryReader.java (100%) rename {ao-tools/altosui => altosui}/AltosUI.app/Contents/Info.plist (100%) rename {ao-tools/altosui => altosui}/AltosUI.app/Contents/MacOS/JavaApplicationStub (100%) rename {ao-tools/altosui => altosui}/AltosUI.app/Contents/PkgInfo (100%) rename {ao-tools/altosui => altosui}/AltosUI.app/Contents/Resources/AltosUIIcon.icns (100%) rename {ao-tools/altosui => altosui}/AltosUI.java (100%) rename {ao-tools/altosui => altosui}/AltosVoice.java (100%) rename {ao-tools/altosui => altosui}/AltosWriter.java (100%) rename {ao-tools/altosui => altosui}/GrabNDrag.java (100%) rename {ao-tools/altosui => altosui}/Instdrv/NSIS/Contrib/InstDrv/Example.nsi (100%) rename {ao-tools/altosui => altosui}/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe (100%) rename {ao-tools/altosui => altosui}/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c (100%) rename {ao-tools/altosui => altosui}/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp (100%) rename {ao-tools/altosui => altosui}/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw (100%) rename {ao-tools/altosui => altosui}/Instdrv/NSIS/Contrib/InstDrv/Readme.txt (100%) rename {ao-tools/altosui => altosui}/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf (100%) rename {ao-tools/altosui => altosui}/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys (100%) rename {ao-tools/altosui => altosui}/Instdrv/NSIS/Plugins/InstDrv.dll (100%) rename {ao-tools/altosui => altosui}/Makefile-standalone (100%) rename {ao-tools/altosui => altosui}/Makefile.am (93%) rename {ao-tools/altosui => altosui}/altos-windows.nsi (100%) rename {ao-tools/altosui => altosui}/altosui-fat (100%) rename {ao-tools/altosui => altosui}/altosui.1 (100%) rename {ao-tools/altosui => altosui}/altusmetrum.jpg (100%) rename {ao-tools => altosui}/libaltos/.gitignore (100%) rename {ao-tools => altosui}/libaltos/Makefile-standalone (100%) rename {ao-tools => altosui}/libaltos/Makefile.am (100%) rename {ao-tools => altosui}/libaltos/altos.dll (100%) rename {ao-tools => altosui}/libaltos/cjnitest.c (100%) rename {ao-tools => altosui}/libaltos/libaltos.c (100%) rename {ao-tools => altosui}/libaltos/libaltos.dylib (100%) rename {ao-tools => altosui}/libaltos/libaltos.h (100%) rename {ao-tools => altosui}/libaltos/libaltos.i0 (100%) diff --git a/ao-tools/altosui/.gitignore b/altosui/.gitignore similarity index 100% rename from ao-tools/altosui/.gitignore rename to altosui/.gitignore diff --git a/ao-tools/altosui/AltOS Package Configuration.pmdoc/01altosui-contents.xml b/altosui/AltOS Package Configuration.pmdoc/01altosui-contents.xml similarity index 100% rename from ao-tools/altosui/AltOS Package Configuration.pmdoc/01altosui-contents.xml rename to altosui/AltOS Package Configuration.pmdoc/01altosui-contents.xml diff --git a/ao-tools/altosui/AltOS Package Configuration.pmdoc/01altosui.xml b/altosui/AltOS Package Configuration.pmdoc/01altosui.xml similarity index 100% rename from ao-tools/altosui/AltOS Package Configuration.pmdoc/01altosui.xml rename to altosui/AltOS Package Configuration.pmdoc/01altosui.xml diff --git a/ao-tools/altosui/AltOS Package Configuration.pmdoc/index.xml b/altosui/AltOS Package Configuration.pmdoc/index.xml similarity index 100% rename from ao-tools/altosui/AltOS Package Configuration.pmdoc/index.xml rename to altosui/AltOS Package Configuration.pmdoc/index.xml diff --git a/ao-tools/altosui/Altos.java b/altosui/Altos.java similarity index 100% rename from ao-tools/altosui/Altos.java rename to altosui/Altos.java diff --git a/ao-tools/altosui/AltosAscent.java b/altosui/AltosAscent.java similarity index 100% rename from ao-tools/altosui/AltosAscent.java rename to altosui/AltosAscent.java diff --git a/ao-tools/altosui/AltosCRCException.java b/altosui/AltosCRCException.java similarity index 100% rename from ao-tools/altosui/AltosCRCException.java rename to altosui/AltosCRCException.java diff --git a/ao-tools/altosui/AltosCSV.java b/altosui/AltosCSV.java similarity index 100% rename from ao-tools/altosui/AltosCSV.java rename to altosui/AltosCSV.java diff --git a/ao-tools/altosui/AltosCSVUI.java b/altosui/AltosCSVUI.java similarity index 100% rename from ao-tools/altosui/AltosCSVUI.java rename to altosui/AltosCSVUI.java diff --git a/ao-tools/altosui/AltosChannelMenu.java b/altosui/AltosChannelMenu.java similarity index 100% rename from ao-tools/altosui/AltosChannelMenu.java rename to altosui/AltosChannelMenu.java diff --git a/ao-tools/altosui/AltosConfig.java b/altosui/AltosConfig.java similarity index 100% rename from ao-tools/altosui/AltosConfig.java rename to altosui/AltosConfig.java diff --git a/ao-tools/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java similarity index 100% rename from ao-tools/altosui/AltosConfigUI.java rename to altosui/AltosConfigUI.java diff --git a/ao-tools/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java similarity index 100% rename from ao-tools/altosui/AltosConfigureUI.java rename to altosui/AltosConfigureUI.java diff --git a/ao-tools/altosui/AltosConvert.java b/altosui/AltosConvert.java similarity index 100% rename from ao-tools/altosui/AltosConvert.java rename to altosui/AltosConvert.java diff --git a/ao-tools/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java similarity index 100% rename from ao-tools/altosui/AltosDataChooser.java rename to altosui/AltosDataChooser.java diff --git a/ao-tools/altosui/AltosDataPoint.java b/altosui/AltosDataPoint.java similarity index 100% rename from ao-tools/altosui/AltosDataPoint.java rename to altosui/AltosDataPoint.java diff --git a/ao-tools/altosui/AltosDataPointReader.java b/altosui/AltosDataPointReader.java similarity index 100% rename from ao-tools/altosui/AltosDataPointReader.java rename to altosui/AltosDataPointReader.java diff --git a/ao-tools/altosui/AltosDebug.java b/altosui/AltosDebug.java similarity index 100% rename from ao-tools/altosui/AltosDebug.java rename to altosui/AltosDebug.java diff --git a/ao-tools/altosui/AltosDescent.java b/altosui/AltosDescent.java similarity index 100% rename from ao-tools/altosui/AltosDescent.java rename to altosui/AltosDescent.java diff --git a/ao-tools/altosui/AltosDevice.java b/altosui/AltosDevice.java similarity index 100% rename from ao-tools/altosui/AltosDevice.java rename to altosui/AltosDevice.java diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/altosui/AltosDeviceDialog.java similarity index 100% rename from ao-tools/altosui/AltosDeviceDialog.java rename to altosui/AltosDeviceDialog.java diff --git a/ao-tools/altosui/AltosDisplayThread.java b/altosui/AltosDisplayThread.java similarity index 100% rename from ao-tools/altosui/AltosDisplayThread.java rename to altosui/AltosDisplayThread.java diff --git a/ao-tools/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java similarity index 100% rename from ao-tools/altosui/AltosEepromDownload.java rename to altosui/AltosEepromDownload.java diff --git a/ao-tools/altosui/AltosEepromIterable.java b/altosui/AltosEepromIterable.java similarity index 100% rename from ao-tools/altosui/AltosEepromIterable.java rename to altosui/AltosEepromIterable.java diff --git a/ao-tools/altosui/AltosEepromMonitor.java b/altosui/AltosEepromMonitor.java similarity index 100% rename from ao-tools/altosui/AltosEepromMonitor.java rename to altosui/AltosEepromMonitor.java diff --git a/ao-tools/altosui/AltosEepromRecord.java b/altosui/AltosEepromRecord.java similarity index 100% rename from ao-tools/altosui/AltosEepromRecord.java rename to altosui/AltosEepromRecord.java diff --git a/ao-tools/altosui/AltosFile.java b/altosui/AltosFile.java similarity index 100% rename from ao-tools/altosui/AltosFile.java rename to altosui/AltosFile.java diff --git a/ao-tools/altosui/AltosFlash.java b/altosui/AltosFlash.java similarity index 100% rename from ao-tools/altosui/AltosFlash.java rename to altosui/AltosFlash.java diff --git a/ao-tools/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java similarity index 100% rename from ao-tools/altosui/AltosFlashUI.java rename to altosui/AltosFlashUI.java diff --git a/ao-tools/altosui/AltosFlightDisplay.java b/altosui/AltosFlightDisplay.java similarity index 100% rename from ao-tools/altosui/AltosFlightDisplay.java rename to altosui/AltosFlightDisplay.java diff --git a/ao-tools/altosui/AltosFlightInfoTableModel.java b/altosui/AltosFlightInfoTableModel.java similarity index 100% rename from ao-tools/altosui/AltosFlightInfoTableModel.java rename to altosui/AltosFlightInfoTableModel.java diff --git a/ao-tools/altosui/AltosFlightReader.java b/altosui/AltosFlightReader.java similarity index 100% rename from ao-tools/altosui/AltosFlightReader.java rename to altosui/AltosFlightReader.java diff --git a/ao-tools/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java similarity index 100% rename from ao-tools/altosui/AltosFlightStatus.java rename to altosui/AltosFlightStatus.java diff --git a/ao-tools/altosui/AltosFlightStatusTableModel.java b/altosui/AltosFlightStatusTableModel.java similarity index 100% rename from ao-tools/altosui/AltosFlightStatusTableModel.java rename to altosui/AltosFlightStatusTableModel.java diff --git a/ao-tools/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java similarity index 100% rename from ao-tools/altosui/AltosFlightUI.java rename to altosui/AltosFlightUI.java diff --git a/ao-tools/altosui/AltosGPS.java b/altosui/AltosGPS.java similarity index 100% rename from ao-tools/altosui/AltosGPS.java rename to altosui/AltosGPS.java diff --git a/ao-tools/altosui/AltosGraph.java b/altosui/AltosGraph.java similarity index 100% rename from ao-tools/altosui/AltosGraph.java rename to altosui/AltosGraph.java diff --git a/ao-tools/altosui/AltosGraphTime.java b/altosui/AltosGraphTime.java similarity index 100% rename from ao-tools/altosui/AltosGraphTime.java rename to altosui/AltosGraphTime.java diff --git a/ao-tools/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java similarity index 100% rename from ao-tools/altosui/AltosGraphUI.java rename to altosui/AltosGraphUI.java diff --git a/ao-tools/altosui/AltosGreatCircle.java b/altosui/AltosGreatCircle.java similarity index 100% rename from ao-tools/altosui/AltosGreatCircle.java rename to altosui/AltosGreatCircle.java diff --git a/ao-tools/altosui/AltosHexfile.java b/altosui/AltosHexfile.java similarity index 100% rename from ao-tools/altosui/AltosHexfile.java rename to altosui/AltosHexfile.java diff --git a/ao-tools/altosui/AltosIgnite.java b/altosui/AltosIgnite.java similarity index 100% rename from ao-tools/altosui/AltosIgnite.java rename to altosui/AltosIgnite.java diff --git a/ao-tools/altosui/AltosIgniteUI.java b/altosui/AltosIgniteUI.java similarity index 100% rename from ao-tools/altosui/AltosIgniteUI.java rename to altosui/AltosIgniteUI.java diff --git a/ao-tools/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java similarity index 100% rename from ao-tools/altosui/AltosInfoTable.java rename to altosui/AltosInfoTable.java diff --git a/ao-tools/altosui/AltosKML.java b/altosui/AltosKML.java similarity index 100% rename from ao-tools/altosui/AltosKML.java rename to altosui/AltosKML.java diff --git a/ao-tools/altosui/AltosLanded.java b/altosui/AltosLanded.java similarity index 100% rename from ao-tools/altosui/AltosLanded.java rename to altosui/AltosLanded.java diff --git a/ao-tools/altosui/AltosLed.java b/altosui/AltosLed.java similarity index 100% rename from ao-tools/altosui/AltosLed.java rename to altosui/AltosLed.java diff --git a/ao-tools/altosui/AltosLights.java b/altosui/AltosLights.java similarity index 100% rename from ao-tools/altosui/AltosLights.java rename to altosui/AltosLights.java diff --git a/ao-tools/altosui/AltosLine.java b/altosui/AltosLine.java similarity index 100% rename from ao-tools/altosui/AltosLine.java rename to altosui/AltosLine.java diff --git a/ao-tools/altosui/AltosLog.java b/altosui/AltosLog.java similarity index 100% rename from ao-tools/altosui/AltosLog.java rename to altosui/AltosLog.java diff --git a/ao-tools/altosui/AltosPad.java b/altosui/AltosPad.java similarity index 100% rename from ao-tools/altosui/AltosPad.java rename to altosui/AltosPad.java diff --git a/ao-tools/altosui/AltosParse.java b/altosui/AltosParse.java similarity index 100% rename from ao-tools/altosui/AltosParse.java rename to altosui/AltosParse.java diff --git a/ao-tools/altosui/AltosPreferences.java b/altosui/AltosPreferences.java similarity index 100% rename from ao-tools/altosui/AltosPreferences.java rename to altosui/AltosPreferences.java diff --git a/ao-tools/altosui/AltosReader.java b/altosui/AltosReader.java similarity index 100% rename from ao-tools/altosui/AltosReader.java rename to altosui/AltosReader.java diff --git a/ao-tools/altosui/AltosRecord.java b/altosui/AltosRecord.java similarity index 100% rename from ao-tools/altosui/AltosRecord.java rename to altosui/AltosRecord.java diff --git a/ao-tools/altosui/AltosRecordIterable.java b/altosui/AltosRecordIterable.java similarity index 100% rename from ao-tools/altosui/AltosRecordIterable.java rename to altosui/AltosRecordIterable.java diff --git a/ao-tools/altosui/AltosReplayReader.java b/altosui/AltosReplayReader.java similarity index 100% rename from ao-tools/altosui/AltosReplayReader.java rename to altosui/AltosReplayReader.java diff --git a/ao-tools/altosui/AltosRomconfig.java b/altosui/AltosRomconfig.java similarity index 100% rename from ao-tools/altosui/AltosRomconfig.java rename to altosui/AltosRomconfig.java diff --git a/ao-tools/altosui/AltosRomconfigUI.java b/altosui/AltosRomconfigUI.java similarity index 100% rename from ao-tools/altosui/AltosRomconfigUI.java rename to altosui/AltosRomconfigUI.java diff --git a/ao-tools/altosui/AltosSerial.java b/altosui/AltosSerial.java similarity index 100% rename from ao-tools/altosui/AltosSerial.java rename to altosui/AltosSerial.java diff --git a/ao-tools/altosui/AltosSerialInUseException.java b/altosui/AltosSerialInUseException.java similarity index 100% rename from ao-tools/altosui/AltosSerialInUseException.java rename to altosui/AltosSerialInUseException.java diff --git a/ao-tools/altosui/AltosSerialMonitor.java b/altosui/AltosSerialMonitor.java similarity index 100% rename from ao-tools/altosui/AltosSerialMonitor.java rename to altosui/AltosSerialMonitor.java diff --git a/ao-tools/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java similarity index 100% rename from ao-tools/altosui/AltosSiteMap.java rename to altosui/AltosSiteMap.java diff --git a/ao-tools/altosui/AltosSiteMapCache.java b/altosui/AltosSiteMapCache.java similarity index 100% rename from ao-tools/altosui/AltosSiteMapCache.java rename to altosui/AltosSiteMapCache.java diff --git a/ao-tools/altosui/AltosSiteMapTile.java b/altosui/AltosSiteMapTile.java similarity index 100% rename from ao-tools/altosui/AltosSiteMapTile.java rename to altosui/AltosSiteMapTile.java diff --git a/ao-tools/altosui/AltosState.java b/altosui/AltosState.java similarity index 100% rename from ao-tools/altosui/AltosState.java rename to altosui/AltosState.java diff --git a/ao-tools/altosui/AltosTelemetry.java b/altosui/AltosTelemetry.java similarity index 100% rename from ao-tools/altosui/AltosTelemetry.java rename to altosui/AltosTelemetry.java diff --git a/ao-tools/altosui/AltosTelemetryIterable.java b/altosui/AltosTelemetryIterable.java similarity index 100% rename from ao-tools/altosui/AltosTelemetryIterable.java rename to altosui/AltosTelemetryIterable.java diff --git a/ao-tools/altosui/AltosTelemetryReader.java b/altosui/AltosTelemetryReader.java similarity index 100% rename from ao-tools/altosui/AltosTelemetryReader.java rename to altosui/AltosTelemetryReader.java diff --git a/ao-tools/altosui/AltosUI.app/Contents/Info.plist b/altosui/AltosUI.app/Contents/Info.plist similarity index 100% rename from ao-tools/altosui/AltosUI.app/Contents/Info.plist rename to altosui/AltosUI.app/Contents/Info.plist diff --git a/ao-tools/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub b/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub similarity index 100% rename from ao-tools/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub rename to altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub diff --git a/ao-tools/altosui/AltosUI.app/Contents/PkgInfo b/altosui/AltosUI.app/Contents/PkgInfo similarity index 100% rename from ao-tools/altosui/AltosUI.app/Contents/PkgInfo rename to altosui/AltosUI.app/Contents/PkgInfo diff --git a/ao-tools/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns b/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns similarity index 100% rename from ao-tools/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns rename to altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns diff --git a/ao-tools/altosui/AltosUI.java b/altosui/AltosUI.java similarity index 100% rename from ao-tools/altosui/AltosUI.java rename to altosui/AltosUI.java diff --git a/ao-tools/altosui/AltosVoice.java b/altosui/AltosVoice.java similarity index 100% rename from ao-tools/altosui/AltosVoice.java rename to altosui/AltosVoice.java diff --git a/ao-tools/altosui/AltosWriter.java b/altosui/AltosWriter.java similarity index 100% rename from ao-tools/altosui/AltosWriter.java rename to altosui/AltosWriter.java diff --git a/ao-tools/altosui/GrabNDrag.java b/altosui/GrabNDrag.java similarity index 100% rename from ao-tools/altosui/GrabNDrag.java rename to altosui/GrabNDrag.java diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/Example.nsi b/altosui/Instdrv/NSIS/Contrib/InstDrv/Example.nsi similarity index 100% rename from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/Example.nsi rename to altosui/Instdrv/NSIS/Contrib/InstDrv/Example.nsi diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe similarity index 100% rename from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe rename to altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c similarity index 100% rename from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c rename to altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp similarity index 100% rename from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp rename to altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw similarity index 100% rename from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw rename to altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/Readme.txt b/altosui/Instdrv/NSIS/Contrib/InstDrv/Readme.txt similarity index 100% rename from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/Readme.txt rename to altosui/Instdrv/NSIS/Contrib/InstDrv/Readme.txt diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf b/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf similarity index 100% rename from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf rename to altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys b/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys similarity index 100% rename from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys rename to altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys diff --git a/ao-tools/altosui/Instdrv/NSIS/Plugins/InstDrv.dll b/altosui/Instdrv/NSIS/Plugins/InstDrv.dll similarity index 100% rename from ao-tools/altosui/Instdrv/NSIS/Plugins/InstDrv.dll rename to altosui/Instdrv/NSIS/Plugins/InstDrv.dll diff --git a/ao-tools/altosui/Makefile-standalone b/altosui/Makefile-standalone similarity index 100% rename from ao-tools/altosui/Makefile-standalone rename to altosui/Makefile-standalone diff --git a/ao-tools/altosui/Makefile.am b/altosui/Makefile.am similarity index 93% rename from ao-tools/altosui/Makefile.am rename to altosui/Makefile.am index 93a43b12..e2ff55af 100644 --- a/ao-tools/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -1,3 +1,4 @@ +SUBDIRS=libaltos JAVAROOT=classes AM_JAVACFLAGS=-encoding UTF-8 @@ -5,7 +6,7 @@ man_MANS=altosui.1 altoslibdir=$(libdir)/altos -CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*" +CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:libaltos:$(FREETTS)/*:/usr/share/java/*" bin_SCRIPTS=altosui @@ -190,13 +191,13 @@ $(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON) jar cfm $@ Manifest.txt \ $(ICONJAR) \ -C classes altosui \ - -C ../libaltos libaltosJNI + -C libaltos libaltosJNI $(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON) jar cfm $@ Manifest-fat.txt \ $(ICONJAR) \ -C classes altosui \ - -C ../libaltos libaltosJNI + -C libaltos libaltosJNI Manifest.txt: Makefile echo 'Main-Class: altosui.AltosUI' > $@ @@ -213,25 +214,25 @@ altosui: Makefile 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 echo "#!/bin/sh" > $@ - echo 'exec jdb -classpath "classes:../libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@ + echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@ chmod +x $@ libaltos.so: -rm -f "$@" - $(LN_S) ../libaltos/.libs/"$@" . + $(LN_S) libaltos/.libs/"$@" . libaltos.dylib: -rm -f "$@" - $(LN_S) ../libaltos/"$@" . + $(LN_S) libaltos/"$@" . altos.dll: -rm -f "$@" - $(LN_S) ../libaltos/"$@" . + $(LN_S) libaltos/"$@" . $(FREETTS_CLASS): -rm -f "$@" diff --git a/ao-tools/altosui/altos-windows.nsi b/altosui/altos-windows.nsi similarity index 100% rename from ao-tools/altosui/altos-windows.nsi rename to altosui/altos-windows.nsi diff --git a/ao-tools/altosui/altosui-fat b/altosui/altosui-fat similarity index 100% rename from ao-tools/altosui/altosui-fat rename to altosui/altosui-fat diff --git a/ao-tools/altosui/altosui.1 b/altosui/altosui.1 similarity index 100% rename from ao-tools/altosui/altosui.1 rename to altosui/altosui.1 diff --git a/ao-tools/altosui/altusmetrum.jpg b/altosui/altusmetrum.jpg similarity index 100% rename from ao-tools/altosui/altusmetrum.jpg rename to altosui/altusmetrum.jpg diff --git a/ao-tools/libaltos/.gitignore b/altosui/libaltos/.gitignore similarity index 100% rename from ao-tools/libaltos/.gitignore rename to altosui/libaltos/.gitignore diff --git a/ao-tools/libaltos/Makefile-standalone b/altosui/libaltos/Makefile-standalone similarity index 100% rename from ao-tools/libaltos/Makefile-standalone rename to altosui/libaltos/Makefile-standalone diff --git a/ao-tools/libaltos/Makefile.am b/altosui/libaltos/Makefile.am similarity index 100% rename from ao-tools/libaltos/Makefile.am rename to altosui/libaltos/Makefile.am diff --git a/ao-tools/libaltos/altos.dll b/altosui/libaltos/altos.dll similarity index 100% rename from ao-tools/libaltos/altos.dll rename to altosui/libaltos/altos.dll diff --git a/ao-tools/libaltos/cjnitest.c b/altosui/libaltos/cjnitest.c similarity index 100% rename from ao-tools/libaltos/cjnitest.c rename to altosui/libaltos/cjnitest.c diff --git a/ao-tools/libaltos/libaltos.c b/altosui/libaltos/libaltos.c similarity index 100% rename from ao-tools/libaltos/libaltos.c rename to altosui/libaltos/libaltos.c diff --git a/ao-tools/libaltos/libaltos.dylib b/altosui/libaltos/libaltos.dylib similarity index 100% rename from ao-tools/libaltos/libaltos.dylib rename to altosui/libaltos/libaltos.dylib diff --git a/ao-tools/libaltos/libaltos.h b/altosui/libaltos/libaltos.h similarity index 100% rename from ao-tools/libaltos/libaltos.h rename to altosui/libaltos/libaltos.h diff --git a/ao-tools/libaltos/libaltos.i0 b/altosui/libaltos/libaltos.i0 similarity index 100% rename from ao-tools/libaltos/libaltos.i0 rename to altosui/libaltos/libaltos.i0 diff --git a/ao-tools/Makefile.am b/ao-tools/Makefile.am index 54dc777a..2850e909 100644 --- a/ao-tools/Makefile.am +++ b/ao-tools/Makefile.am @@ -1 +1 @@ -SUBDIRS=lib ao-rawload ao-dbg ao-dumplog ao-bitbang ao-eeprom ao-list ao-load ao-postflight ao-view libaltos altosui +SUBDIRS=lib ao-rawload ao-dbg ao-dumplog ao-bitbang ao-eeprom ao-list ao-load ao-postflight ao-view diff --git a/configure.ac b/configure.ac index 903c5765..22af00ab 100644 --- a/configure.ac +++ b/configure.ac @@ -133,6 +133,8 @@ PKG_CHECK_MODULES([SNDFILE], [sndfile]) AC_OUTPUT([ Makefile +altosui/Makefile +altosui/libaltos/Makefile ao-tools/Makefile ao-tools/lib/Makefile ao-tools/ao-rawload/Makefile @@ -144,8 +146,6 @@ ao-tools/ao-list/Makefile ao-tools/ao-load/Makefile ao-tools/ao-postflight/Makefile ao-tools/ao-view/Makefile -ao-tools/libaltos/Makefile -ao-tools/altosui/Makefile ao-utils/Makefile src/Version ]) -- 2.30.2