Merging [MelnormeLang]

# Conflicts: # documentation/ChangeLog.md
GoClipse · Dec 29, 2016 · 093b60f · 093b60f
2 parents 521a960 + 4f3e7e0
commit 093b60f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/documentation/ChangeLog.md b/documentation/ChangeLog.md
@@ -1,6 +1,7 @@
 ## release ChangeLog
 
 ### (NextVersion)
+ * Fixed: Build Target's append environment variables might not replace variables correctly in Windows, due to case issues.
  * Default setting for "auto-insert" of Code Snippets is now false.
  * Fixed stale validation message for location field in New Project Wizard.
  * Fixed stale validation message for Build Command field in Build Targets property page and Launch Configurations dialog.

diff --git a/melnorme_util/META-INF/MANIFEST.MF b/melnorme_util/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Version: 0.10.0.qualifier
 Bundle-Name: Melnorme Utils
 Bundle-Vendor: https://github.com/bruno-medeiros/MelnormeEclipse
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="4.11.0"
+Require-Bundle: org.junit;bundle-version="4.11.0";resolution:=optional
 Export-Package: melnorme.utilbox.collections,
  melnorme.utilbox.collections.iter,
  melnorme.utilbox.concurrency,

diff --git a/plugin_tooling/src-lang/melnorme/lang/tooling/commands/CommandInvocation.java b/plugin_tooling/src-lang/melnorme/lang/tooling/commands/CommandInvocation.java
@@ -17,6 +17,7 @@
 import java.util.Map.Entry;
 
 import melnorme.lang.tooling.utils.ArgumentsParser;
+import melnorme.lang.utils.EnvUtils;
 import melnorme.lang.utils.ProcessUtils;
 import melnorme.utilbox.collections.HashMap2;
 import melnorme.utilbox.collections.Indexable;
@@ -106,7 +107,7 @@ public ProcessBuilder getProcessBuilder() {
 			environment.clear();			
 		}
 		for (Entry<String, String> envVar : getEnvironmentVars()) {
-			environment.put(envVar.getKey(), envVar.getValue());
+			EnvUtils.putVarInEnvMap(environment, envVar.getKey(), envVar.getValue());
 		}
 
 		return pb;

diff --git a/releng/build.xml b/releng/build.xml
@@ -102,7 +102,7 @@ overwriting the previous one. (This removes history from the git repo it is push
 	<target name="prepareProjectSite.initGit" if="projectSiteGitURL" depends="clean">
 		<condition property="prepareProjectSite.initGit._gitArg" 
 			value="init" 
-			else="clone -n ${projectSiteGitURL} ${_projectSiteDir}">
+			else="clone --depth 1 -n ${projectSiteGitURL} ${_projectSiteDir}">
 			<istrue value="${resetGitHistory}"/>
 		</condition>
 		<runGit dir="${_projectSiteDir}" argLine="${prepareProjectSite.initGit._gitArg}" />