From 7655aa68da25dc40ff564062359807047cd5d37d Mon Sep 17 00:00:00 2001 From: soochoi Date: Wed, 7 Jun 2006 15:59:23 +0000 Subject: [PATCH] move vs_solutions to package directory --- Makefile.am | 4 +- configure.in | 4 +- package/windows/Makefile.am | 35 ++++-------------- .../vs_solutions}/CASAInstall/CASA.ncb | Bin .../vs_solutions}/CASAInstall/CASA.sln | 0 .../vs_solutions}/CASAInstall/CASA.suo | Bin .../vs_solutions}/CASAInstall/CASA.vdproj | 0 .../vs_solutions}/CASAInstall/Makefile.am | 7 ++++ .../vs_solutions}/CASAInstall/eula.rtf | 0 .../vs_solutions}/CASAManager/CASAManager.sln | 0 .../vs_solutions}/CASAManager/CASAManager.suo | Bin .../windows/vs_solutions}/Makefile.am | 0 .../miCASA-Dev-msm/miCASA-Dev-msm.vdproj | 0 .../miCASA-msm/miCASA-msm.vdproj | 0 .../windows/vs_solutions}/micasad/micasad.sln | 0 .../windows/vs_solutions}/micasad/micasad.suo | Bin 16 files changed, 18 insertions(+), 32 deletions(-) rename {vs_solutions => package/windows/vs_solutions}/CASAInstall/CASA.ncb (100%) rename {vs_solutions => package/windows/vs_solutions}/CASAInstall/CASA.sln (100%) rename {vs_solutions => package/windows/vs_solutions}/CASAInstall/CASA.suo (100%) rename {vs_solutions => package/windows/vs_solutions}/CASAInstall/CASA.vdproj (100%) rename {vs_solutions => package/windows/vs_solutions}/CASAInstall/Makefile.am (93%) rename {vs_solutions => package/windows/vs_solutions}/CASAInstall/eula.rtf (100%) rename {vs_solutions => package/windows/vs_solutions}/CASAManager/CASAManager.sln (100%) rename {vs_solutions => package/windows/vs_solutions}/CASAManager/CASAManager.suo (100%) rename {vs_solutions => package/windows/vs_solutions}/Makefile.am (100%) rename {vs_solutions => package/windows/vs_solutions}/miCASA-Dev-msm/miCASA-Dev-msm.vdproj (100%) rename {vs_solutions => package/windows/vs_solutions}/miCASA-msm/miCASA-msm.vdproj (100%) rename {vs_solutions => package/windows/vs_solutions}/micasad/micasad.sln (100%) rename {vs_solutions => package/windows/vs_solutions}/micasad/micasad.suo (100%) diff --git a/Makefile.am b/Makefile.am index e9101d39..e23fb98c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,8 +34,8 @@ DIST_SUBDIRS = c_micasacache c_common c_micasadk c_micasad c_sharp \ endif if WINDOWS -SUBDIRS = c_micasacache c_common c_micasadk c_jwrapper vs_solutions package -DIST_SUBDIRS = c_micasacache c_common c_micasadk c_jwrapper vs_solutions package +SUBDIRS = c_micasacache c_common c_micasadk c_jwrapper package +DIST_SUBDIRS = c_micasacache c_common c_micasadk c_jwrapper package endif EXTRA_DIST = include include/*.h \ diff --git a/configure.in b/configure.in index bd9b21ef..5154541c 100644 --- a/configure.in +++ b/configure.in @@ -306,11 +306,11 @@ c_jwrapper/src/Makefile c_jwrapper/jnsscs/Makefile c_jwrapper/jnsscs/linux/Makefile c_jwrapper/jnsscs/windows/Makefile -vs_solutions/Makefile -vs_solutions/CASAInstall/Makefile package/Makefile package/linux/Makefile package/windows/Makefile +package/windows/vs_solutions/Makefile +package/windows/vs_solutions/CASAInstall/Makefile package/linux/CASA.spec ]) diff --git a/package/windows/Makefile.am b/package/windows/Makefile.am index f159729d..bce4f68e 100755 --- a/package/windows/Makefile.am +++ b/package/windows/Makefile.am @@ -18,39 +18,18 @@ # # ####################################################################### -#how do you get the version?? -if DEBUG -TARGET_CFG = Debug -CFLAGS += -v -w -else -TARGET_CFG = Release -endif -BUILT_FILE = $(PACKAGE)-$(VERSION).tar.bz2 +SUBDIRS = vs_solutions -.PHONY: package package-clean package-install package-uninstall casa +DIST_SUBDIRS = vs_solutions -package: $(BUILT_FILE) +CFILES = -all clean: +EXTRA_DIST = -$(BUILT_FILE): - [ -d BUILT ] | mkdir -p BUILT - cp -p $(top_srcdir)/bin/Setup.* BUILT - cp -p $(top_srcdir)/bin/CASA.msi BUILT - tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT - bzip2 -z $(PACKAGE)-$(VERSION).tar - -package-install: package - -package-uninstall: - -package-clean clean-local: - rm -f *.bz2 - rm -rf BUILT - -distclean-local: package-clean - rm -f Makefile $(BUILT_FILE) +.PHONY: package package-clean package-install package-uninstall +package package-clean package-install package-uninstall: + $(MAKE) -C $(TARGET_OS) $@ maintainer-clean-local: rm -f Makefile.in diff --git a/vs_solutions/CASAInstall/CASA.ncb b/package/windows/vs_solutions/CASAInstall/CASA.ncb similarity index 100% rename from vs_solutions/CASAInstall/CASA.ncb rename to package/windows/vs_solutions/CASAInstall/CASA.ncb diff --git a/vs_solutions/CASAInstall/CASA.sln b/package/windows/vs_solutions/CASAInstall/CASA.sln similarity index 100% rename from vs_solutions/CASAInstall/CASA.sln rename to package/windows/vs_solutions/CASAInstall/CASA.sln diff --git a/vs_solutions/CASAInstall/CASA.suo b/package/windows/vs_solutions/CASAInstall/CASA.suo similarity index 100% rename from vs_solutions/CASAInstall/CASA.suo rename to package/windows/vs_solutions/CASAInstall/CASA.suo diff --git a/vs_solutions/CASAInstall/CASA.vdproj b/package/windows/vs_solutions/CASAInstall/CASA.vdproj similarity index 100% rename from vs_solutions/CASAInstall/CASA.vdproj rename to package/windows/vs_solutions/CASAInstall/CASA.vdproj diff --git a/vs_solutions/CASAInstall/Makefile.am b/package/windows/vs_solutions/CASAInstall/Makefile.am similarity index 93% rename from vs_solutions/CASAInstall/Makefile.am rename to package/windows/vs_solutions/CASAInstall/Makefile.am index 9bda2d0f..aa17b68b 100755 --- a/vs_solutions/CASAInstall/Makefile.am +++ b/package/windows/vs_solutions/CASAInstall/Makefile.am @@ -74,7 +74,13 @@ $(MODULE_NAME).$(MODULE_EXT): $(SFILES) $(OBJDIR) devenv "$(VSINSTALLDIR)/devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) $(CASABINDIR) cp -f $(TARGET_CFG)/Setup.* $(CASABINDIR) + [ -d BUILT ] | mkdir -p BUILT + cp -p $(CASABINDIR)/Setup.* BUILT + cp -p $(CASABINDIR)/CASA.msi BUILT + tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT + bzip2 -z $(PACKAGE)-$(VERSION).tar + devenv: @if ! test -x "$(VSINSTALLDIR)/devenv.exe";then echo "Error: MS Studio .NET is currently required to build MSI and MSM";exit 1;fi @@ -102,6 +108,7 @@ clean-local: if [ -d $(TARGET_CFG) ]; then rm -rf $(TARGET_CFG); fi if [ -d Debug ]; then rm -rf Debug; fi if [ -f build.log ]; then rm -f build.log; fi + if [ -d BUILT ]; then rm -rf BUILT; fi distclean-local: diff --git a/vs_solutions/CASAInstall/eula.rtf b/package/windows/vs_solutions/CASAInstall/eula.rtf similarity index 100% rename from vs_solutions/CASAInstall/eula.rtf rename to package/windows/vs_solutions/CASAInstall/eula.rtf diff --git a/vs_solutions/CASAManager/CASAManager.sln b/package/windows/vs_solutions/CASAManager/CASAManager.sln similarity index 100% rename from vs_solutions/CASAManager/CASAManager.sln rename to package/windows/vs_solutions/CASAManager/CASAManager.sln diff --git a/vs_solutions/CASAManager/CASAManager.suo b/package/windows/vs_solutions/CASAManager/CASAManager.suo similarity index 100% rename from vs_solutions/CASAManager/CASAManager.suo rename to package/windows/vs_solutions/CASAManager/CASAManager.suo diff --git a/vs_solutions/Makefile.am b/package/windows/vs_solutions/Makefile.am similarity index 100% rename from vs_solutions/Makefile.am rename to package/windows/vs_solutions/Makefile.am diff --git a/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj b/package/windows/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj similarity index 100% rename from vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj rename to package/windows/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj diff --git a/vs_solutions/miCASA-msm/miCASA-msm.vdproj b/package/windows/vs_solutions/miCASA-msm/miCASA-msm.vdproj similarity index 100% rename from vs_solutions/miCASA-msm/miCASA-msm.vdproj rename to package/windows/vs_solutions/miCASA-msm/miCASA-msm.vdproj diff --git a/vs_solutions/micasad/micasad.sln b/package/windows/vs_solutions/micasad/micasad.sln similarity index 100% rename from vs_solutions/micasad/micasad.sln rename to package/windows/vs_solutions/micasad/micasad.sln diff --git a/vs_solutions/micasad/micasad.suo b/package/windows/vs_solutions/micasad/micasad.suo similarity index 100% rename from vs_solutions/micasad/micasad.suo rename to package/windows/vs_solutions/micasad/micasad.suo