From 0d2958f69305233a3cd00e99c4f5cb57b71da8a3 Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Tue, 4 Jun 2013 12:52:27 -0500 Subject: [PATCH] Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file. Change-Id: Ie625a515e8dc30cacc002bb6d8e77365c1347a13 Former-commit-id: 33a5b6d42d863780a3c91c852a789e7fbc8e0347 [formerly 71b04e31477ee8d649c9cd3911e5ecef9cdc985b [formerly 02af194872173d89f77e15a6a8caca1e5812dbe4]] Former-commit-id: 71b04e31477ee8d649c9cd3911e5ecef9cdc985b Former-commit-id: bc1ef2c5feb75e6fb450b2d47b6dd6307db9137c --- nativeLib/build.native/makefile.dist | 90 +--- nativeLib/decrypt_file/.gitignore | 1 + nativeLib/dist.native/.cproject | 481 ++++++++---------- nativeLib/dist.native/deploy-install.xml | 21 - nativeLib/edexBridge/.gitignore | 1 + nativeLib/edex_com/.gitignore | 1 + nativeLib/edex_notify/.gitignore | 1 + nativeLib/edex_pdc/.gitignore | 1 + nativeLib/gridslice/.gitignore | 1 + nativeLib/ncep_grib2module/.gitignore | 1 + nativeLib/rary.meteorological/.gitignore | 1 + nativeLib/rary.ohd.calb/.gitignore | 1 + nativeLib/rary.ohd.ifp/.gitignore | 1 + nativeLib/rary.ohd.ofs.db/.gitignore | 1 + nativeLib/rary.ohd.ofs.shared/.gitignore | 1 + .../rary.ohd.ofs.shefpars.driv/.gitignore | 1 + nativeLib/rary.ohd.ofs/.gitignore | 1 + nativeLib/rary.ohd.pproc.gribit/.gitignore | 1 + nativeLib/rary.ohd.pproc.util/.gitignore | 1 + nativeLib/rary.ohd.pproc/.gitignore | 1 + nativeLib/rary.ohd.util/.gitignore | 1 + nativeLib/rary.ohd.whfs/.gitignore | 1 + nativeLib/runy.runso/.gitignore | 1 + 23 files changed, 245 insertions(+), 367 deletions(-) create mode 100644 nativeLib/decrypt_file/.gitignore delete mode 100644 nativeLib/dist.native/deploy-install.xml create mode 100644 nativeLib/edexBridge/.gitignore create mode 100644 nativeLib/edex_com/.gitignore create mode 100644 nativeLib/edex_notify/.gitignore create mode 100644 nativeLib/edex_pdc/.gitignore create mode 100644 nativeLib/gridslice/.gitignore create mode 100644 nativeLib/ncep_grib2module/.gitignore create mode 100644 nativeLib/rary.meteorological/.gitignore create mode 100644 nativeLib/rary.ohd.calb/.gitignore create mode 100644 nativeLib/rary.ohd.ifp/.gitignore create mode 100644 nativeLib/rary.ohd.ofs.db/.gitignore create mode 100644 nativeLib/rary.ohd.ofs.shared/.gitignore create mode 100644 nativeLib/rary.ohd.ofs.shefpars.driv/.gitignore create mode 100644 nativeLib/rary.ohd.ofs/.gitignore create mode 100644 nativeLib/rary.ohd.pproc.gribit/.gitignore create mode 100644 nativeLib/rary.ohd.pproc.util/.gitignore create mode 100644 nativeLib/rary.ohd.pproc/.gitignore create mode 100644 nativeLib/rary.ohd.util/.gitignore create mode 100644 nativeLib/rary.ohd.whfs/.gitignore create mode 100644 nativeLib/runy.runso/.gitignore diff --git a/nativeLib/build.native/makefile.dist b/nativeLib/build.native/makefile.dist index e2dab9ff27..dbb2a3641d 100644 --- a/nativeLib/build.native/makefile.dist +++ b/nativeLib/build.native/makefile.dist @@ -9,15 +9,8 @@ # include optional user defined variables -include makefile.conf~ -tar_archive=$$(basename $(BUILD_DIR)).tar +files_native=$(wildcard ../files.native) tmp_location=tmp~/$$(basename $(BUILD_DIR)) -setup_dir=setup -uninstall_script=$$(basename $(realpath .))_uninstall.sh -permissions_script=$$(basename $(realpath .))_permissions.sh - -ifndef INSTALL_DIR -INSTALL_DIR = $(HOME)/opt/$$(basename $(realpath .)) -endif init: ifndef BUILD_DIR @@ -37,87 +30,20 @@ _all: init # arrange the files $$(export tmp_location=$(tmp_location);bash arrange_files.sh) - # create setup directory for install/uninstall files - mkdir -p $(tmp_location)/$(setup_dir) - # finished - -all: clean _all _permissions_script _uninstall_script - -_permissions_script: - # create permissions_script - $(MAKE) PERMISSIONS_ROOT=$(tmp_location) \ - -f ../build.native/makefile.perm _create_permissions_script - sed "s|$(tmp_location)|..|" file_permissions.sh > \ - $(tmp_location)/$(setup_dir)/$(permissions_script) - chmod a+x $(tmp_location)/$(setup_dir)/$(permissions_script) - rm file_permissions.sh - -_uninstall_script: - # create uninstall_script - $$(cd $(tmp_location)/$(setup_dir);\ - echo "cd \$$(dirname \$$0)" > $(uninstall_script);\ - find ../ -type f -exec echo rm -f {} \; >> $(uninstall_script);\ - find ../ -type l -exec echo unlink {} \; >> $(uninstall_script);\ - find ../ -depth -type d -exec echo rmdir {} \; >> $(uninstall_script);\ - echo "exit 0" >> $(uninstall_script);\ - chmod a+x $(uninstall_script)\ - ) + +_deploy: + # copy files from the tmp_location into files.native + + echo $(files_native) + rsync -avz $(tmp_location)/* $(files_native) clean: init # rm tmp_location rm -fr $(tmp_location) # finished - -install: init all - # copy files from tmp_location to install_dir - mkdir -p $(INSTALL_DIR) - rsync -au $(tmp_location)/ $(INSTALL_DIR) - # finished - -uninstall: init - # call uninstall_script - $(INSTALL_DIR)/$(setup_dir)/$(uninstall_script) - # finished - -dist: init all _tar_archive - -_clean_tar_archive: - # rm tar_archive - rm -fr $(tar_archive) - # finished -_tar_archive: - # create tar_archive - tar -cvf $(tar_archive) -C $(tmp_location) . - # finished - -distupdate: init update _clean_tar_archive _tar_archive - -distclean: init clean _clean_tar_archive - -distinstall: init - # untar tar_archive into install_dir - mkdir -p $(INSTALL_DIR) - tar -xpf $(tar_archive) -C $(INSTALL_DIR) - # finished - -_update: init clean - # untar tar_archive - mkdir -p $(tmp_location)_tar - tar -xpf $(tar_archive) -C $(tmp_location)_tar - -_updated_tmp_location: - # copy files from _all step into extracted tar files - cp -fa $(tmp_location)/* $(tmp_location)_tar - - # move $(tmp_location)_tar to $(tmp_location) - rm -fr $(tmp_location) - mv $(tmp_location)_tar $(tmp_location) - -update: _update _all _updated_tmp_location _permissions_script _uninstall_script - -.PHONY: init all _all clean install update _update dist distclean distinstall +update: init _all _deploy clean # include optional user defined targets (and possible target overrides) -include makefile.targets~ \ No newline at end of file diff --git a/nativeLib/decrypt_file/.gitignore b/nativeLib/decrypt_file/.gitignore new file mode 100644 index 0000000000..b58a2c26b7 --- /dev/null +++ b/nativeLib/decrypt_file/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.release diff --git a/nativeLib/dist.native/.cproject b/nativeLib/dist.native/.cproject index f8513e2621..0a4ad1480e 100644 --- a/nativeLib/dist.native/.cproject +++ b/nativeLib/dist.native/.cproject @@ -2,268 +2,221 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -make - -install -true -true -true - - -make - -dist -true -true -true - - -make - -distinstall -true -true -true - - -make - -all -true -true -true - - -make - -uninstall -true -true -true - - -make - -distupdate -true -true -true - - -make - -update -true -true -true - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + make + update + true + true + true + + + diff --git a/nativeLib/dist.native/deploy-install.xml b/nativeLib/dist.native/deploy-install.xml deleted file mode 100644 index 4294e0cad7..0000000000 --- a/nativeLib/dist.native/deploy-install.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nativeLib/edexBridge/.gitignore b/nativeLib/edexBridge/.gitignore new file mode 100644 index 0000000000..a261883c99 --- /dev/null +++ b/nativeLib/edexBridge/.gitignore @@ -0,0 +1 @@ +/Release diff --git a/nativeLib/edex_com/.gitignore b/nativeLib/edex_com/.gitignore new file mode 100644 index 0000000000..2d69fdad40 --- /dev/null +++ b/nativeLib/edex_com/.gitignore @@ -0,0 +1 @@ +/Build x86 diff --git a/nativeLib/edex_notify/.gitignore b/nativeLib/edex_notify/.gitignore new file mode 100644 index 0000000000..2d69fdad40 --- /dev/null +++ b/nativeLib/edex_notify/.gitignore @@ -0,0 +1 @@ +/Build x86 diff --git a/nativeLib/edex_pdc/.gitignore b/nativeLib/edex_pdc/.gitignore new file mode 100644 index 0000000000..98bbc3165b --- /dev/null +++ b/nativeLib/edex_pdc/.gitignore @@ -0,0 +1 @@ +/Debug diff --git a/nativeLib/gridslice/.gitignore b/nativeLib/gridslice/.gitignore new file mode 100644 index 0000000000..98bbc3165b --- /dev/null +++ b/nativeLib/gridslice/.gitignore @@ -0,0 +1 @@ +/Debug diff --git a/nativeLib/ncep_grib2module/.gitignore b/nativeLib/ncep_grib2module/.gitignore new file mode 100644 index 0000000000..2d69fdad40 --- /dev/null +++ b/nativeLib/ncep_grib2module/.gitignore @@ -0,0 +1 @@ +/Build x86 diff --git a/nativeLib/rary.meteorological/.gitignore b/nativeLib/rary.meteorological/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.meteorological/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.calb/.gitignore b/nativeLib/rary.ohd.calb/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.calb/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.ifp/.gitignore b/nativeLib/rary.ohd.ifp/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.ifp/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.ofs.db/.gitignore b/nativeLib/rary.ohd.ofs.db/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.ofs.db/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.ofs.shared/.gitignore b/nativeLib/rary.ohd.ofs.shared/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.ofs.shared/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.ofs.shefpars.driv/.gitignore b/nativeLib/rary.ohd.ofs.shefpars.driv/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.ofs.shefpars.driv/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.ofs/.gitignore b/nativeLib/rary.ohd.ofs/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.ofs/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.pproc.gribit/.gitignore b/nativeLib/rary.ohd.pproc.gribit/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.pproc.gribit/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.pproc.util/.gitignore b/nativeLib/rary.ohd.pproc.util/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.pproc.util/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.pproc/.gitignore b/nativeLib/rary.ohd.pproc/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.pproc/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.util/.gitignore b/nativeLib/rary.ohd.util/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.util/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/rary.ohd.whfs/.gitignore b/nativeLib/rary.ohd.whfs/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/rary.ohd.whfs/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug diff --git a/nativeLib/runy.runso/.gitignore b/nativeLib/runy.runso/.gitignore new file mode 100644 index 0000000000..b037bec333 --- /dev/null +++ b/nativeLib/runy.runso/.gitignore @@ -0,0 +1 @@ +/i386-pc-linux-gnu.debug