Adding the *NIX based script for the merge tool
authorlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Wed, 18 Oct 2006 17:20:55 +0000 (17:20 +0000)
committerlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Wed, 18 Oct 2006 17:20:55 +0000 (17:20 +0000)
git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@1794 de2fecce-e211-0410-80a6-f3fac2684e05

edk2/Tools/bin/merge [new file with mode: 0755]

diff --git a/edk2/Tools/bin/merge b/edk2/Tools/bin/merge
new file mode 100755 (executable)
index 0000000..32b1411
--- /dev/null
@@ -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 $@