Mercurial > projects > ddmd

changeset 172:5a9a88e919f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BuildHelper updated to use src and lib from dmd2/, not copies
author korDen
date Fri, 08 Oct 2010 20:23:30 +0400
parents b080e62b16b4
children d237b38b5858
files .hgignore buildHelper.d
diffstat 2 files changed, 13 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sun Oct 03 17:55:10 2010 -0400
+++ b/.hgignore	Fri Oct 08 20:23:30 2010 +0400
@@ -4,4 +4,10 @@
 ^\.
 
 \.map$
-\.obj$
\ No newline at end of file
+\.obj$
+glob:dmd2/*
+glob:dmd.*.zip
+glob:buildHelper.d.deps
+glob:buildHelper.exe
+glob:dmd.lib
+glob:bin/*
--- a/buildHelper.d	Sun Oct 03 17:55:10 2010 -0400
+++ b/buildHelper.d	Fri Oct 08 20:23:30 2010 +0400
@@ -14,14 +14,14 @@
 version(Windows)
 {
 	enum scriptName = "build.bat";
-	enum osSubDir   = "windows\\";
+	enum osSubDir   = "windows";
 	enum configFile = "sc.ini";
 	enum execExt    = ".exe";
 }
 else
 {
 	enum scriptName = "./build.sh";
-	enum osSubDir   = "linux/";
+	enum osSubDir   = "linux";
 	enum configFile = "dmd.conf";
 	enum execExt    = "";
 }
@@ -205,23 +205,16 @@
 	// Copy and patch config file
 	doChDir("../../..");
 	copyAndPatch(
-		normFilePath("dmd2/"~osSubDir~"bin/"~configFile),
+		normFilePath("dmd2/"~osSubDir~"/bin/"~configFile),
 		normFilePath("bin/"~configFile),
 		(ref string data) {
-			data = data.replace(normDirPath("../.."), normDirPath(".."));
+			data = data.replace(normDirPath("../.."), normDirPath("../dmd2"));
+			data = data.replace(normDirPath("../lib"), normDirPath("../dmd2/"~osSubDir~"/lib"));
 		}
 	);
-	
-	// Copy std lib
-	if(exists("src"))
-		rmdirRecurse("src");
-	mkdir("src");
-	copyRecurse("dmd2/src/druntime",    "src/druntime");
-	copyRecurse("dmd2/src/phobos",      "src/phobos"  );
-	copyRecurse("dmd2/"~osSubDir~"lib", "lib"         );
 
 	// Copy linker
-	doCopy("dmd2/"~osSubDir~"bin/link"~execExt, "bin/link"~execExt);
+	doCopy("dmd2/"~osSubDir~"/bin/link"~execExt, "bin/link"~execExt);
 
 	return true;
 }