Fix the CLASSPATH

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1807 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/bin/ContextTool b/Tools/bin/ContextTool
index c67933eaa678aead57c85de01834f235cc87d381..4870e4006ef71a1df2b50a776086ee4efbc2131e 100755 (executable)
--- a/Tools/bin/ContextTool
+++ b/Tools/bin/ContextTool
@@ -9,7 +9,6 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
-# export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/ContextTool.jar
 
 # Run Framework Wizard
-java -cp ${WORKSPACE}/Tools/Jars/ContextTool.jar org.tianocore.context.ContextMain $@
+java -cp "${WORKSPACE}/Tools/Jars/ContextTool.jar" org.tianocore.context.ContextMain $@

diff --git a/Tools/bin/FrameworkWizard b/Tools/bin/FrameworkWizard
index fb9e527698900a2e048fa562437635a2b78c5a13..1473909cdb2c5069ccb3865018534547d4f580aa 100755 (executable)
--- a/Tools/bin/FrameworkWizard
+++ b/Tools/bin/FrameworkWizard
@@ -9,7 +9,5 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 
-export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/bin/FrameworkWizard.jar
-
 # Run Framework Wizard
-java -Xmx256m org.tianocore.frameworkwizard.FrameworkWizardUI
+java -Xmx256m -cp "$CLASSPATH:$WORKSPACE/Tools/bin/FrameworkWizard.jar" org.tianocore.frameworkwizard.FrameworkWizardUI

diff --git a/Tools/bin/MigrationTools b/Tools/bin/MigrationTools
index fc47bef2eb0237c4ef4bbae680c7a9838217c005..b16f956dad35d7983b552e0fd43898309b68e351 100755 (executable)
--- a/Tools/bin/MigrationTools
+++ b/Tools/bin/MigrationTools
@@ -9,7 +9,5 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 
-export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/bin/MigrationTools.jar
-
 # Run Migration Tool
-java org.tianocore.migration.MigrationTool
\ No newline at end of file
+java -cp "$CLASSPATH:$WORKSPACE/Tools/bin/MigrationTools.jar" org.tianocore.migration.MigrationTool

diff --git a/Tools/bin/fw b/Tools/bin/fw
index 75f29b0cddbe2e77deff89993bf1ac574a694906..0f8c80f2c06afe390567be66e18c0a0807d10cda 100755 (executable)
--- a/Tools/bin/fw
+++ b/Tools/bin/fw
@@ -9,7 +9,5 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 
-export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/bin/FrameworkWizard.jar
-
 # Run Framework Wizard
-java org.tianocore.frameworkwizard.FrameworkWizardUI
+java -cp "$CLASSPATH:$WORKSPACE/Tools/bin/FrameworkWizard.jar" org.tianocore.frameworkwizard.FrameworkWizardUI

diff --git a/Tools/bin/merge b/Tools/bin/merge
index 32b1411af06cb72dc05602fafb688b1b56b69e11..8bd2efdbdaebcb8005ba67e8949bb933d4a42562 100755 (executable)
--- a/Tools/bin/merge
+++ b/Tools/bin/merge
@@ -9,7 +9,6 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
-# export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/ContextTool.jar
 
 # Run Framework Wizard
-java -cp ${WORKSPACE}/Tools/bin/Merge.jar org.tianocore.Merge.Merge $@
+java -cp "${WORKSPACE}/Tools/bin/Merge.jar" org.tianocore.Merge.Merge $@