From 307202b8487a8eef27aaeaceb512afc5a627e691 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 14 Aug 2013 00:02:33 +0000 Subject: [PATCH] New Ant build scripts for Windows. Work in progress: packaging installer does not yet work. git-svn-id: https://valelab.ucsf.edu/svn/micromanager2/trunk@11546 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd --- acqEngine/build.bat | 13 --- acqEngine/build.xml | 12 +++ autofocus/build.xml | 120 ++++++---------------- autofocus/buildscripts/Autofocus.xml | 4 + autofocus/buildscripts/AutofocusDuo.xml | 4 + autofocus/buildscripts/AutofocusTB.xml | 4 + autofocus/buildscripts/OughtaFocus.xml | 4 + autofocus/buildscripts/autofocusbuild.xml | 23 +++++ build.xml | 117 +++++++++++++++++++++ buildscripts/buildprops.xml | 104 +++++++++++++++++++ buildscripts/clojurebuild.xml | 18 ++++ buildscripts/javabuild.xml | 50 +++++++++ buildscripts/javalibs.xml | 24 +++++ mmstudio/build.xml | 47 +++++++++ mmstudio/build32.bat | 2 - mmstudio/build32simple.bat | 47 --------- mmstudio/build64.bat | 2 - plugins/BFCorrector/build.bat | 17 --- plugins/BFCorrector/build.xml | 3 + plugins/Big/build.xml | 59 +---------- plugins/Bleach/build.xml | 58 ----------- plugins/CRISP/build.bat | 17 --- plugins/CRISP/build.xml | 7 ++ plugins/ClojureEditor/build.xml | 33 ++---- plugins/DLLAutoReloader/build.bat | 7 -- plugins/DLLAutoReloader/build.xml | 8 ++ plugins/DataBrowser/build.bat | 7 -- plugins/DataBrowser/build.xml | 3 + plugins/Example/build.xml | 3 + plugins/Gaussian/build.bat | 17 --- plugins/Gaussian/build.xml | 13 +++ plugins/HCS/build.xml | 43 +------- plugins/ImageFlipper/build.bat | 17 --- plugins/ImageFlipper/build.xml | 3 + plugins/IntelligentAcquisition/build.bat | 17 --- plugins/IntelligentAcquisition/build.xml | 3 + plugins/MetadataExporter/build.xml | 8 ++ plugins/MultiCamera/build.xml | 59 +---------- plugins/NewImageFlipper/build.bat | 17 --- plugins/NewImageFlipper/build.xml | 3 + plugins/PixelCalibrator/build.xml | 60 +---------- plugins/Projector/build.xml | 62 +---------- plugins/Recall/build.xml | 61 +---------- plugins/SlideExplorer/build.xml | 72 ++----------- plugins/SlideExplorer2/build.bat | 12 --- plugins/SlideExplorer2/build.xml | 11 ++ plugins/SplitView/build.xml | 61 +---------- plugins/StageControl/build.xml | 64 +----------- plugins/Tracker/build.xml | 58 ----------- plugins/TwoPhoton/build.xml | 3 + plugins/build.xml | 34 ++++++ plugins/clojurepluginbuild.xml | 8 ++ plugins/javapluginbuild.xml | 8 ++ plugins/pluginpaths.xml | 6 ++ plugins/pluginprops.xml | 11 ++ 55 files changed, 619 insertions(+), 929 deletions(-) delete mode 100644 acqEngine/build.bat create mode 100644 acqEngine/build.xml create mode 100644 autofocus/buildscripts/Autofocus.xml create mode 100644 autofocus/buildscripts/AutofocusDuo.xml create mode 100644 autofocus/buildscripts/AutofocusTB.xml create mode 100644 autofocus/buildscripts/OughtaFocus.xml create mode 100644 autofocus/buildscripts/autofocusbuild.xml create mode 100644 build.xml create mode 100644 buildscripts/buildprops.xml create mode 100644 buildscripts/clojurebuild.xml create mode 100644 buildscripts/javabuild.xml create mode 100644 buildscripts/javalibs.xml create mode 100644 mmstudio/build.xml delete mode 100644 mmstudio/build32.bat delete mode 100644 mmstudio/build32simple.bat delete mode 100644 mmstudio/build64.bat delete mode 100644 plugins/BFCorrector/build.bat create mode 100644 plugins/BFCorrector/build.xml delete mode 100644 plugins/Bleach/build.xml delete mode 100644 plugins/CRISP/build.bat create mode 100644 plugins/CRISP/build.xml delete mode 100644 plugins/DLLAutoReloader/build.bat create mode 100644 plugins/DLLAutoReloader/build.xml delete mode 100644 plugins/DataBrowser/build.bat create mode 100644 plugins/DataBrowser/build.xml create mode 100644 plugins/Example/build.xml delete mode 100644 plugins/Gaussian/build.bat create mode 100644 plugins/Gaussian/build.xml delete mode 100644 plugins/ImageFlipper/build.bat create mode 100644 plugins/ImageFlipper/build.xml delete mode 100644 plugins/IntelligentAcquisition/build.bat create mode 100644 plugins/IntelligentAcquisition/build.xml create mode 100644 plugins/MetadataExporter/build.xml delete mode 100644 plugins/NewImageFlipper/build.bat create mode 100644 plugins/NewImageFlipper/build.xml delete mode 100644 plugins/SlideExplorer2/build.bat create mode 100644 plugins/SlideExplorer2/build.xml delete mode 100644 plugins/Tracker/build.xml create mode 100644 plugins/TwoPhoton/build.xml create mode 100644 plugins/build.xml create mode 100644 plugins/clojurepluginbuild.xml create mode 100644 plugins/javapluginbuild.xml create mode 100644 plugins/pluginpaths.xml create mode 100644 plugins/pluginprops.xml diff --git a/acqEngine/build.bat b/acqEngine/build.bat deleted file mode 100644 index fa5f795779..0000000000 --- a/acqEngine/build.bat +++ /dev/null @@ -1,13 +0,0 @@ -if exist classes rmdir classes /s /q -if exist build rmdir build /s /q -mkdir classes -mkdir build -xcopy /E /y src classes\ -"%JAVA_HOME%\bin\java" -cp ../../3rdpartypublic/classext/clojure.jar;../MMCoreJ_wrap/MMCoreJ.jar;../../3rdpartypublic/classext/ij.jar;../mmstudio/MMJ_.jar;../../3rdpartypublic/classext/bsh-2.0b4.jar;./src -Dclojure.compile.path=classes clojure.lang.Compile org.micromanager.acq-engine -"%JAVA_HOME%\bin\jar" cf MMAcqEngine.jar -C classes\ . -copy /Y MMAcqEngine.jar ..\bin_Win32\ -copy /Y MMAcqEngine.jar ..\bin_x64\ -mkdir ..\Install_Win32\micro-manager\plugins\Micro-Manager -copy /Y MMAcqEngine.jar ..\Install_Win32\micro-manager\plugins\Micro-Manager\ -mkdir ..\Install_x64\micro-manager\plugins\Micro-Manager -copy /Y MMAcqEngine.jar ..\Install_x64\micro-manager\plugins\Micro-Manager\ diff --git a/acqEngine/build.xml b/acqEngine/build.xml new file mode 100644 index 0000000000..0ab45b46de --- /dev/null +++ b/acqEngine/build.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/autofocus/build.xml b/autofocus/build.xml index da0568efbf..895d4931a7 100644 --- a/autofocus/build.xml +++ b/autofocus/build.xml @@ -1,86 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/autofocus/buildscripts/Autofocus.xml b/autofocus/buildscripts/Autofocus.xml new file mode 100644 index 0000000000..a026586464 --- /dev/null +++ b/autofocus/buildscripts/Autofocus.xml @@ -0,0 +1,4 @@ + + + + diff --git a/autofocus/buildscripts/AutofocusDuo.xml b/autofocus/buildscripts/AutofocusDuo.xml new file mode 100644 index 0000000000..fafb98202e --- /dev/null +++ b/autofocus/buildscripts/AutofocusDuo.xml @@ -0,0 +1,4 @@ + + + + diff --git a/autofocus/buildscripts/AutofocusTB.xml b/autofocus/buildscripts/AutofocusTB.xml new file mode 100644 index 0000000000..1aa229d259 --- /dev/null +++ b/autofocus/buildscripts/AutofocusTB.xml @@ -0,0 +1,4 @@ + + + + diff --git a/autofocus/buildscripts/OughtaFocus.xml b/autofocus/buildscripts/OughtaFocus.xml new file mode 100644 index 0000000000..8571952b11 --- /dev/null +++ b/autofocus/buildscripts/OughtaFocus.xml @@ -0,0 +1,4 @@ + + + + diff --git a/autofocus/buildscripts/autofocusbuild.xml b/autofocus/buildscripts/autofocusbuild.xml new file mode 100644 index 0000000000..61ca291ea9 --- /dev/null +++ b/autofocus/buildscripts/autofocusbuild.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build.xml b/build.xml new file mode 100644 index 0000000000..8c28e757f3 --- /dev/null +++ b/build.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildscripts/buildprops.xml b/buildscripts/buildprops.xml new file mode 100644 index 0000000000..54d101694f --- /dev/null +++ b/buildscripts/buildprops.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildscripts/clojurebuild.xml b/buildscripts/clojurebuild.xml new file mode 100644 index 0000000000..9049bf8837 --- /dev/null +++ b/buildscripts/clojurebuild.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + diff --git a/buildscripts/javabuild.xml b/buildscripts/javabuild.xml new file mode 100644 index 0000000000..81042633d8 --- /dev/null +++ b/buildscripts/javabuild.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildscripts/javalibs.xml b/buildscripts/javalibs.xml new file mode 100644 index 0000000000..75bb75bf33 --- /dev/null +++ b/buildscripts/javalibs.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mmstudio/build.xml b/mmstudio/build.xml new file mode 100644 index 0000000000..e62f5f74d5 --- /dev/null +++ b/mmstudio/build.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mmstudio/build32.bat b/mmstudio/build32.bat deleted file mode 100644 index 57194c6d69..0000000000 --- a/mmstudio/build32.bat +++ /dev/null @@ -1,2 +0,0 @@ -..\..\3rdparty\apache-ant-1.6.5\bin\ant -f build32.xml compile build - diff --git a/mmstudio/build32simple.bat b/mmstudio/build32simple.bat deleted file mode 100644 index 7a7c2ca8ab..0000000000 --- a/mmstudio/build32simple.bat +++ /dev/null @@ -1,47 +0,0 @@ -rem Building Micro-Manager 32 bit - -rem clean -rmdir /S/Q build -del MMJ_.jar -del MMReader_.jar - -rem compile -md build -javac -sourcepath ./src -d build -source 1.5 -target 1.5 -g ^ --classpath ../../3rdpartypublic/classext/*;../MMCoreJ_wrap/MMCoreJ.jar; ^ -./src/org/micromanager/utils/AutofocusBase.java - -rem copying files -md build\org\micromanager\icons -copy /Y src\org\micromanager\icons\*.png build\org\micromanager\icons\ -copy /Y src\org\micromanager\icons\*.gif build\org\micromanager\icons\ -copy /Y src\org\micromanager\conf\*.html build\org\micromanager\conf\ - -rem make jars -copy /Y bin\plugins_mmstudio.config build\plugins.config -jar -cfm MMJ_.jar ./src/MANIFEST.MF -C ./build . -copy /Y bin\plugins_reader.config build\plugins.config -jar -cfm MMReader_.jar ./src/MANIFEST.MF -C ./build . - -rem install -del ..\Install_Win32\micro-manager\mmgr_dal_*.dll -del ..\Install_Win32\micro-manager\MMCoreJ_wrap.dll -copy /Y ..\DeviceAdapters\TetheredCam\*.dll ..\Install_Win32\micro-manager\ -copy /Y ..\..\3rdpartypublic\classext\data.json.jar ..\Install_Win32\micro-manager\plugins\Micro-Manager\ -move /Y ..\Install_Win32\micro-manager\plugins\ij.jar ..\Install_Win32\micro-manager\ -copy /Y ..\..\3rdpartypublic\JavaLauncher\ImageJ.exe ..\Install_Win32\micro-manager\ -copy /Y MMJ_.jar ..\Install_Win32\micro-manager\ -copy /Y MMJ_.jar ..\bin32\plugins\Micro-Manager\ -copy /Y ..\scripts\*.bsh ..\Install_Win32\micro-manager\scripts\ -copy /Y ..\bin32\mmgr_dal_*.dll ..\Install_Win32\micro-manager\ -copy /Y ..\bin32\MMCoreJ_wrap.dll ..\Install_Win32\micro-manager\ -copy /Y ..\bin32\MMConfig_demo.cfg ..\Install_Win32\micro-manager\ - -rem Make device list -java -cp plugins\Micro-Manager\MMJ_.jar;plugins\Micro-Manager\MMCoreJ.jar DeviceListBuilder NotdeviceDiscoveryEnabled -java -cp plugins\Micro-Manager\MMJ_.jar;plugins\Micro-Manager\MMCoreJ.jar DeviceListBuilder deviceDiscoveryEnabled - -rem Create Installation Package -pushdir ..\Install_Win32\micro-manager\ -..\..\3rdparty\Inno_Setup_5\iscc.exe /F MMSetup_ ../MM-ImageJ-Install32.iss -popdir \ No newline at end of file diff --git a/mmstudio/build64.bat b/mmstudio/build64.bat deleted file mode 100644 index e8a0f95180..0000000000 --- a/mmstudio/build64.bat +++ /dev/null @@ -1,2 +0,0 @@ -..\..\3rdparty\apache-ant-1.6.5\bin\ant -f build64.xml compile build - diff --git a/plugins/BFCorrector/build.bat b/plugins/BFCorrector/build.bat deleted file mode 100644 index 1dffd8708a..0000000000 --- a/plugins/BFCorrector/build.bat +++ /dev/null @@ -1,17 +0,0 @@ -rem Build script for BFCorrector plugin - -rem clean -rmdir /S/Q build -del BFCorrector.jar - -rem compile -md build -javac -sourcepath ./src -d build -source 1.5 -target 1.5 -g ^ --classpath ../../../3rdpartypublic/classext/*;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar; ^ -./src/org/micromanager/bfcorrector/*.java - -rem make jars -jar cf BFCorrector.jar -C ./build . - -rem install -copy /Y BFCorrector.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins \ No newline at end of file diff --git a/plugins/BFCorrector/build.xml b/plugins/BFCorrector/build.xml new file mode 100644 index 0000000000..acf63b0a0a --- /dev/null +++ b/plugins/BFCorrector/build.xml @@ -0,0 +1,3 @@ + + + diff --git a/plugins/Big/build.xml b/plugins/Big/build.xml index ff34a8148c..391be18538 100644 --- a/plugins/Big/build.xml +++ b/plugins/Big/build.xml @@ -1,58 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/plugins/Bleach/build.xml b/plugins/Bleach/build.xml deleted file mode 100644 index 5af5a6ce4e..0000000000 --- a/plugins/Bleach/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/CRISP/build.bat b/plugins/CRISP/build.bat deleted file mode 100644 index 4c8afe58e5..0000000000 --- a/plugins/CRISP/build.bat +++ /dev/null @@ -1,17 +0,0 @@ -rem Build script for CRISP plugin - -rem clean -rmdir /S/Q build -del CRISP.jar - -rem compile -md build -javac -sourcepath ./src -d build -source 1.5 -target 1.5 -g ^ --classpath ../../../3rdpartypublic/classext/*;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar; ^ -./src/org/micromanager/CRISP/*.java - -rem make jars -jar cf CRISP.jar -C ./build . - -rem install -copy /Y CRISP.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins \ No newline at end of file diff --git a/plugins/CRISP/build.xml b/plugins/CRISP/build.xml new file mode 100644 index 0000000000..1aed0967f3 --- /dev/null +++ b/plugins/CRISP/build.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/ClojureEditor/build.xml b/plugins/ClojureEditor/build.xml index 2c13de3546..4226d06bb0 100644 --- a/plugins/ClojureEditor/build.xml +++ b/plugins/ClojureEditor/build.xml @@ -1,29 +1,8 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/plugins/DLLAutoReloader/build.bat b/plugins/DLLAutoReloader/build.bat deleted file mode 100644 index 1c9f326953..0000000000 --- a/plugins/DLLAutoReloader/build.bat +++ /dev/null @@ -1,7 +0,0 @@ -rem We need Java 6 for this plugin. If you have Java 6, installed, set an environment variable, JDK6, to its location. -if exist classes rmdir classes /s /q -mkdir classes -xcopy /E /y src classes\ -java -cp src;classes;../../../3rdpartypublic/classext/*;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar;../../acqEngine/MMAcqEngine.jar -Djava.library.path=../../bin_x64 -Dclojure.compile.path=classes -server clojure.lang.Compile DLLAutoReloader.plugin -jar cf DLLAutoReloader.jar -C classes\ . -copy /Y DLLAutoReloader.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins\ diff --git a/plugins/DLLAutoReloader/build.xml b/plugins/DLLAutoReloader/build.xml new file mode 100644 index 0000000000..df5b5d464c --- /dev/null +++ b/plugins/DLLAutoReloader/build.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/plugins/DataBrowser/build.bat b/plugins/DataBrowser/build.bat deleted file mode 100644 index 22a8a33171..0000000000 --- a/plugins/DataBrowser/build.bat +++ /dev/null @@ -1,7 +0,0 @@ -rem We need Java 6 for this plugin. If you have Java 6, installed, set an environment variable, JDK6, to its location. -if exist classes rmdir classes /s /q -mkdir classes -xcopy /E /y src classes\ -java -cp src;classes;../../../3rdpartypublic/classext/clojure.jar;../../../3rdpartypublic/classext/data.json.jar;../../../3rdpartypublic/classext/ij.jar;../../../3rdpartypublic/classext/bsh-2.0b4.jar;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar;../../acqEngine/MMAcqEngine.jar -Djava.library.path=../../bin_Win32 -Dclojure.compile.path=classes -server clojure.lang.Compile org.micromanager.browser.plugin -jar cf DataBrowser.jar -C classes\ . -copy /Y DataBrowser.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins\ diff --git a/plugins/DataBrowser/build.xml b/plugins/DataBrowser/build.xml new file mode 100644 index 0000000000..1f6bd7f0a6 --- /dev/null +++ b/plugins/DataBrowser/build.xml @@ -0,0 +1,3 @@ + + + diff --git a/plugins/Example/build.xml b/plugins/Example/build.xml new file mode 100644 index 0000000000..7c96766fc4 --- /dev/null +++ b/plugins/Example/build.xml @@ -0,0 +1,3 @@ + + + diff --git a/plugins/Gaussian/build.bat b/plugins/Gaussian/build.bat deleted file mode 100644 index 5ed0cd5c0f..0000000000 --- a/plugins/Gaussian/build.bat +++ /dev/null @@ -1,17 +0,0 @@ -rem Build script for CRISP plugin - -rem clean -rmdir /S/Q build -del Gaussian.jar - -rem compile -md build -javac -sourcepath ./source -d build -source 1.5 -target 1.5 -g ^ --classpath ../../../3rdpartypublic/classext/*;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar; ^ -./source/*.java - -rem make jars -jar cf Gaussian.jar -C ./build . - -rem install -copy /Y Gaussian.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins \ No newline at end of file diff --git a/plugins/Gaussian/build.xml b/plugins/Gaussian/build.xml new file mode 100644 index 0000000000..47bd3a00e9 --- /dev/null +++ b/plugins/Gaussian/build.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/plugins/HCS/build.xml b/plugins/HCS/build.xml index 2943da67c3..d4c5816237 100644 --- a/plugins/HCS/build.xml +++ b/plugins/HCS/build.xml @@ -1,40 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + diff --git a/plugins/ImageFlipper/build.bat b/plugins/ImageFlipper/build.bat deleted file mode 100644 index 841a9bee59..0000000000 --- a/plugins/ImageFlipper/build.bat +++ /dev/null @@ -1,17 +0,0 @@ -rem Build script for ImageFlipper plugin - -rem clean -rmdir /S/Q build -del ImageFlipper.jar - -rem compile -md build -javac -sourcepath ./src -d build -source 1.5 -target 1.5 -g ^ --classpath ../../../3rdpartypublic/classext/*;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar; ^ -./src/org/micromanager/imageflipper/*.java - -rem make jars -jar cf ImageFlipper.jar -C ./build . - -rem install -copy /Y ImageFlipper.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins \ No newline at end of file diff --git a/plugins/ImageFlipper/build.xml b/plugins/ImageFlipper/build.xml new file mode 100644 index 0000000000..f0be16a336 --- /dev/null +++ b/plugins/ImageFlipper/build.xml @@ -0,0 +1,3 @@ + + + diff --git a/plugins/IntelligentAcquisition/build.bat b/plugins/IntelligentAcquisition/build.bat deleted file mode 100644 index fdd305b864..0000000000 --- a/plugins/IntelligentAcquisition/build.bat +++ /dev/null @@ -1,17 +0,0 @@ -rem Build script for IntelligentAcquisition plugin - -rem clean -rmdir /S/Q build -del IntelligentAcquisition.jar - -rem compile -md build -javac -sourcepath ./src -d build -source 1.5 -target 1.5 -g ^ --classpath ../../../3rdpartypublic/classext/*;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar; ^ -./src/org/micromanager/intelligentacquisition/*.java - -rem make jars -jar cf IntelligentAcquisition.jar -C ./build . - -rem install -copy /Y IntelligentAcquisition.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins \ No newline at end of file diff --git a/plugins/IntelligentAcquisition/build.xml b/plugins/IntelligentAcquisition/build.xml new file mode 100644 index 0000000000..25d14147e3 --- /dev/null +++ b/plugins/IntelligentAcquisition/build.xml @@ -0,0 +1,3 @@ + + + diff --git a/plugins/MetadataExporter/build.xml b/plugins/MetadataExporter/build.xml new file mode 100644 index 0000000000..ed0e184116 --- /dev/null +++ b/plugins/MetadataExporter/build.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/plugins/MultiCamera/build.xml b/plugins/MultiCamera/build.xml index 5bd6b8d4a7..99e9703086 100644 --- a/plugins/MultiCamera/build.xml +++ b/plugins/MultiCamera/build.xml @@ -1,58 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/plugins/NewImageFlipper/build.bat b/plugins/NewImageFlipper/build.bat deleted file mode 100644 index 2c1d5d7b45..0000000000 --- a/plugins/NewImageFlipper/build.bat +++ /dev/null @@ -1,17 +0,0 @@ -rem Build script for ImageFlipper plugin - -rem clean -rmdir /S/Q build -del ImageFlipper.jar - -rem compile -md build -javac -sourcepath ./src -d build -source 1.5 -target 1.5 -g ^ --classpath ../../../3rdpartypublic/classext/*;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar; ^ -./src/org/micromanager/newimageflipper/*.java - -rem make jars -jar cf ImageFlipper.jar -C ./build . - -rem install -copy /Y ImageFlipper.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins \ No newline at end of file diff --git a/plugins/NewImageFlipper/build.xml b/plugins/NewImageFlipper/build.xml new file mode 100644 index 0000000000..88019b39b9 --- /dev/null +++ b/plugins/NewImageFlipper/build.xml @@ -0,0 +1,3 @@ + + + diff --git a/plugins/PixelCalibrator/build.xml b/plugins/PixelCalibrator/build.xml index 4023cd035f..ebddb996f1 100755 --- a/plugins/PixelCalibrator/build.xml +++ b/plugins/PixelCalibrator/build.xml @@ -1,57 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/plugins/Projector/build.xml b/plugins/Projector/build.xml index 49d132aa26..ae2d64910c 100755 --- a/plugins/Projector/build.xml +++ b/plugins/Projector/build.xml @@ -1,59 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/plugins/Recall/build.xml b/plugins/Recall/build.xml index 725518b6b4..9f918a8a95 100644 --- a/plugins/Recall/build.xml +++ b/plugins/Recall/build.xml @@ -1,58 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/plugins/SlideExplorer/build.xml b/plugins/SlideExplorer/build.xml index ac240c3721..bc1e423b79 100755 --- a/plugins/SlideExplorer/build.xml +++ b/plugins/SlideExplorer/build.xml @@ -1,61 +1,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/plugins/SlideExplorer2/build.bat b/plugins/SlideExplorer2/build.bat deleted file mode 100644 index 6dc2b694a8..0000000000 --- a/plugins/SlideExplorer2/build.bat +++ /dev/null @@ -1,12 +0,0 @@ -rem We need Java 6 for this plugin. If you have Java 6, installed, set an environment variable, JDK6, to its location. -if exist classes rmdir classes /s /q -if exist build rmdir build /s /q -mkdir classes -mkdir build -mkdir -xcopy /E /y src classes\ -java -cp src;classes;../../../3rdpartypublic/classext/clojure.jar;../../../3rdpartypublic/classext/core.cache.jar;../../../3rdpartypublic/classext/core.memoize.jar;../../../3rdpartypublic/classext/ij.jar;../../../3rdpartypublic/classext/bsh-2.0b4.jar;../../mmstudio/MMJ_.jar;../../MMCoreJ_wrap/MMCoreJ.jar;../../acqEngine/MMAcqEngine.jar -Djava.library.path=../../bin_x64 -Dclojure.compile.path=classes -server clojure.lang.Compile slide-explorer.plugin -xcopy /E /y src build\ -xcopy classes\org\micromanager\SlideExplorer2.class build\org\micromanager\ -jar cf SlideExplorer2.jar -C build\ . -copy /Y SlideExplorer2.jar ..\..\Install_AllPlatforms\micro-manager\mmplugins\ diff --git a/plugins/SlideExplorer2/build.xml b/plugins/SlideExplorer2/build.xml new file mode 100644 index 0000000000..5e327db6a7 --- /dev/null +++ b/plugins/SlideExplorer2/build.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/plugins/SplitView/build.xml b/plugins/SplitView/build.xml index edbd29b589..7f4426973d 100644 --- a/plugins/SplitView/build.xml +++ b/plugins/SplitView/build.xml @@ -1,58 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/plugins/StageControl/build.xml b/plugins/StageControl/build.xml index 21481253d4..39cad4e32f 100644 --- a/plugins/StageControl/build.xml +++ b/plugins/StageControl/build.xml @@ -1,61 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/plugins/Tracker/build.xml b/plugins/Tracker/build.xml deleted file mode 100644 index 205ab99f3a..0000000000 --- a/plugins/Tracker/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/TwoPhoton/build.xml b/plugins/TwoPhoton/build.xml new file mode 100644 index 0000000000..d83273a739 --- /dev/null +++ b/plugins/TwoPhoton/build.xml @@ -0,0 +1,3 @@ + + + diff --git a/plugins/build.xml b/plugins/build.xml new file mode 100644 index 0000000000..2ef1270a21 --- /dev/null +++ b/plugins/build.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/clojurepluginbuild.xml b/plugins/clojurepluginbuild.xml new file mode 100644 index 0000000000..edab0d7a36 --- /dev/null +++ b/plugins/clojurepluginbuild.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/plugins/javapluginbuild.xml b/plugins/javapluginbuild.xml new file mode 100644 index 0000000000..b3bc7f8769 --- /dev/null +++ b/plugins/javapluginbuild.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/plugins/pluginpaths.xml b/plugins/pluginpaths.xml new file mode 100644 index 0000000000..39f8680af0 --- /dev/null +++ b/plugins/pluginpaths.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/plugins/pluginprops.xml b/plugins/pluginprops.xml new file mode 100644 index 0000000000..e32dc1cf29 --- /dev/null +++ b/plugins/pluginprops.xml @@ -0,0 +1,11 @@ + + + + + + + + + + +