[llvm-branch-commits] [cfe-branch] r93016 - /cfe/branches/Apple/lemur-IB/NMakefile

[Daniel Dunbar]

Author: ddunbar
Date: Fri Jan  8 12:51:37 2010
New Revision: 93016

URL: http://llvm.org/viewvc/llvm-project?rev=93016&view=rev
Log:
Fix some quoting and only install 'clang.exe' into the DSTROOT.

Modified:
    cfe/branches/Apple/lemur-IB/NMakefile

Modified: cfe/branches/Apple/lemur-IB/NMakefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/lemur-IB/NMakefile?rev=93016&r1=93015&r2=93016&view=diff

==============================================================================
--- cfe/branches/Apple/lemur-IB/NMakefile (original)
+++ cfe/branches/Apple/lemur-IB/NMakefile Fri Jan  8 12:51:37 2010
@@ -1,10 +1,21 @@
 CMAKE=cmake
-VCBUILD="$(VS90COMNTOOLS)\..\..\VC\VCPackages\vcbuild"
+VCBUILD=$(VS90COMNTOOLS)\..\..\VC\VCPackages\vcbuild
 JOBS=1
 
-#CMAKE="c:\program files\CMake 2.8\bin\cmake"
+#CMAKE=c:\program files\CMake 2.8\bin\cmake
 #JOBS=4
 
+###
+
+# Instead of jiggling the project files to only install the bits we want, we do
+# a real install into the OBJROOT, and then copy the exact bits we want to the
+# DSTROOT.
+#
+# It would be nice to not build unnecessary stuff though, to save build time.
+STAGEROOT=$(OBJROOT)\install
+
+BINDEST=$(DSTROOT)\AppleInternal\bin
+
 all:
 	@echo "usage: make [target]"
 	@echo
@@ -14,13 +25,18 @@
 	@echo "  install  : configure, build and install"
 
 configure:
+	"$(CMAKE)" -E make_directory "$(OBJROOT)"
 	cd "$(OBJROOT)"
-	$(CMAKE) -DCMAKE_INSTALL_PREFIX:=$(DSTROOT) -DLLVM_TARGETS_TO_BUILD:=X86 -G "Visual Studio 9 2008" $(SRCROOT)\src
+	"$(CMAKE)" "-DCMAKE_INSTALL_PREFIX:=$(STAGEROOT)" \
+	         -DLLVM_TARGETS_TO_BUILD:=X86 \
+	         -G "Visual Studio 9 2008" \
+	         "$(SRCROOT)\src"
 
 build: configure
 	cd "$(OBJROOT)"
-	$(VCBUILD) /M$(JOBS) /r LLVM.sln "Release|Win32"
+	"$(VCBUILD)" /M$(JOBS) /r LLVM.sln "Release|Win32"
+	"$(VCBUILD)" /M$(JOBS) /r INSTALL.vcproj "Release|Win32"
 
 install: build
-	cd "$(OBJROOT)"
-	$(VCBUILD) /M$(JOBS) /r INSTALL.vcproj "Release|Win32"
+	"$(CMAKE)" -E make_directory "$(BINDEST)"
+	xcopy /i/y "$(STAGEROOT)\bin\clang.exe" "$(BINDEST)"