diff options
| author | lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-10-18 17:20:55 +0000 |
|---|---|---|
| committer | lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-10-18 17:20:55 +0000 |
| commit | 81dbf46f989c2da28f013254c2c1161873f2adb0 (patch) | |
| tree | 0ccdc8e9ca9f9f7e50013bbff92255503c60ad58 /Tools/bin | |
| parent | 486e69b36fcb96e43225f84a99f93c29b371a6a3 (diff) | |
| download | edk2-81dbf46f989c2da28f013254c2c1161873f2adb0.zip edk2-81dbf46f989c2da28f013254c2c1161873f2adb0.tar.gz edk2-81dbf46f989c2da28f013254c2c1161873f2adb0.tar.bz2 | |
Adding the *NIX based script for the merge tool
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1794 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Tools/bin')
| -rwxr-xr-x | Tools/bin/merge | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Tools/bin/merge b/Tools/bin/merge new file mode 100755 index 0000000..32b1411 --- /dev/null +++ b/Tools/bin/merge @@ -0,0 +1,15 @@ +#!/bin/sh +# +# Copyright (c) 2006, Intel Corporation +# All rights reserved. This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# 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 $@ |