From: bbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 20 Oct 2006 20:59:43 +0000 (+0000)
Subject: Fix the CLASSPATH
X-Git-Tag: edk2-stable201903~24067
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=92a4a910df99b2151e501b76f311575f2e1ebe9a

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 c67933eaa6..4870e4006e 100755
--- 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 fb9e527698..1473909cdb 100755
--- 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 fc47bef2eb..b16f956dad 100755
--- 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 75f29b0cdd..0f8c80f2c0 100755
--- 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 32b1411af0..8bd2efdbda 100755
--- 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 $@