geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CASA: changes in windows makefile -continue

Browse Source
This commit is contained in:
soochoi
2006-11-08 06:13:32 +00:00
parent a60d5a0904
commit 5b8f57d9c0
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CASA/package/windows/vs_solutions/CASA32-msi/Makefile.am
View File

@@ -47,6 +47,8 @@ export MONO_PATH := $(MONO_PATH)
PLATFORMINDEPENDENTSOURCEDIR = .. PLATFORMINDEPENDENTSOURCEDIR = ..
PLATFORMDEPENDENTSOURCEDIR = . PLATFORMDEPENDENTSOURCEDIR = .
OBJDIR = ./BUILT
MODULE_NAME =CASA MODULE_NAME =CASA
MODULE_EXT =msi MODULE_EXT =msi
@@ -69,9 +71,9 @@ $(MODULE_NAME).$(MODULE_EXT): $(SFILES) $(OBJDIR) devenv
"$(TOOLDIR)/w32/VersionVDProj/bin/VersionVDProj.exe" -msi $(MSIFILE) version=$(VERSION) "$(TOOLDIR)/w32/VersionVDProj/bin/VersionVDProj.exe" -msi $(MSIFILE) version=$(VERSION)
@echo [======== Building Solution $(SFILES) ========] @echo [======== Building Solution $(SFILES) ========]
"$(VSINSTALLDIR)\devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log "$(VSINSTALLDIR)\devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log
cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) ./BUILT cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) $(OBJDIR)
cp -f $(TARGET_CFG)/setup.exe ./BUILT cp -f $(TARGET_CFG)/setup.exe $(OBJDIR)
tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT tar -cvf $(PACKAGE)-$(VERSION).tar $(OBJDIR)
bzip2 -z $(PACKAGE)-$(VERSION).tar bzip2 -z $(PACKAGE)-$(VERSION).tar
@@ -80,8 +82,6 @@ devenv:
$(OBJDIR): $(OBJDIR):
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
[ -d $(CASABINDIR) ] || mkdir -p $(CASABINDIR)
[ -d BUILT ] || mkdir -p BUILT
install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)
@@ -103,7 +103,7 @@ clean-local:
if [ -d $(TARGET_CFG) ]; then rm -rf $(TARGET_CFG); fi if [ -d $(TARGET_CFG) ]; then rm -rf $(TARGET_CFG); fi
if [ -d Debug ]; then rm -rf Debug; fi if [ -d Debug ]; then rm -rf Debug; fi
if [ -f build.log ]; then rm -f build.log; fi if [ -f build.log ]; then rm -f build.log; fi
if [ -d BUILT ]; then rm -rf BUILT; fi if [ -d $(OBJDIR) ]; then rm -rf $(OBJDIR); fi
if [ -f $(PACKAGE)-$(VERSION).tar.bz2 ]; then rm -f $(PACKAGE)-$(VERSION).tar.bz2; fi if [ -f $(PACKAGE)-$(VERSION).tar.bz2 ]; then rm -f $(PACKAGE)-$(VERSION).tar.bz2; fi
distclean-local: distclean-local:

19
CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am
View File

@@ -47,6 +47,8 @@ export MONO_PATH := $(MONO_PATH)
PLATFORMINDEPENDENTSOURCEDIR = .. PLATFORMINDEPENDENTSOURCEDIR = ..
PLATFORMDEPENDENTSOURCEDIR = . PLATFORMDEPENDENTSOURCEDIR = .
OBJDIR = ../BUILT
MODULE_NAME =CASA_x64 MODULE_NAME =CASA_x64
MODULE_EXT =msi MODULE_EXT =msi
@@ -71,11 +73,11 @@ $(MODULE_NAME).$(MODULE_EXT): $(SFILES) $(OBJDIR) devenv
"$(TOOLDIR)/w32/VersionVDProj/bin/VersionVDProj.exe" -msi $(MSIFILE) version=$(VERSION) "$(TOOLDIR)/w32/VersionVDProj/bin/VersionVDProj.exe" -msi $(MSIFILE) version=$(VERSION)
@echo [======== Building Solution $(SFILES) ========] @echo [======== Building Solution $(SFILES) ========]
"$(VSINSTALLDIR)\devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log "$(VSINSTALLDIR)\devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log
cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) ../BUILT/bin64 cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) $(OBJDIR)/bin64
cp -f $(TARGET_CFG)/setup.exe ../BUILT/bin64 cp -f $(TARGET_CFG)/setup.exe $(OBJDIR)/bin64
cp -p ../CASA32-msi/$(TARGET_CFG)/setup.exe ../BUILT/bin cp -p ../CASA32-msi/$(TARGET_CFG)/setup.exe $(OBJDIR)/bin
cp -p ../CASA32-msi/$(TARGET_CFG)/CASA.msi ../BUILT/bin cp -p ../CASA32-msi/$(TARGET_CFG)/CASA.msi $(OBJDIR)/bin
tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT tar -cvf $(PACKAGE)-$(VERSION).tar $(OBJDIR)
bzip2 -z $(PACKAGE)-$(VERSION).tar bzip2 -z $(PACKAGE)-$(VERSION).tar
@@ -83,11 +85,10 @@ devenv:
@if ! test -x "$(VSINSTALLDIR)\devenv.exe";then echo "Error: MS Studio .NET is currently required to build MSI and MSM";exit 1;fi @if ! test -x "$(VSINSTALLDIR)\devenv.exe";then echo "Error: MS Studio .NET is currently required to build MSI and MSM";exit 1;fi
$(OBJDIR): $(OBJDIR):
echo "creating obj dir"
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
[ -d $(CASABINDIR) ] || mkdir -p $(CASABINDIR) [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)/bin64
[ -d ../BUILT ] || mkdir -p ../BUILT [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)/bin
[ -d ../BUILT ] || mkdir -p ../BUILT/bin64
[ -d ../BUILT ] || mkdir -p ../BUILT/bin
install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)