Provide updated patch for Mangos (8095) and restore option to use "git am". Update How To Install.txt accordingly and clarify why/when patch is needed also for Windows.

git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1183 5f9c896b-1e26-0410-94da-f77f675e2462

Author: nofantasy

docs/How to install.txt

@@ -8,7 +8,7 @@
 MS Windows:
 - Create a new folder under "src\bindings\" within the MaNGOS source called "ScriptDev2"
 - Checkout the ScriptDev2 trunk from "https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2"
-- Apply the Git patch to Mangos - "git apply src/bindings/ScriptDev2/patches/MaNGOS-XXXX-ScriptDev2.patch" ('XXXX' is revision number for Mangos).
+- Apply the Git patch to Mangos - "git am src/bindings/ScriptDev2/patches/MaNGOS-XXXX-ScriptDev2.patch" ('XXXX' is revision number for Mangos). (Note this is not required for compile, but needed to avoid deletion of untracked folders/files in GIT-directory when using certain GIT commands (example: git clean -f -d))
 - Compile MaNGOS
 - Compile ScriptDev2 using the ScriptVC80 or ScriptVC90 Solution within the ScriptDev2 folder (this will overwrite the Mangoscript dll in the output directory)
 
@@ -17,7 +17,7 @@ GNU/Linux:
 SVN:
 - Apply MaNGOS-XXXX-ScriptDev2.patch to Mangos, where XXXX is the highest version to that of your MaNGOS revision.
 GIT:
-- Apply the Git patch to Mangos - "git apply src/bindings/ScriptDev2/patches/MaNGOS-XXXX-ScriptDev2.patch"
+- Apply the Git patch to Mangos - "git am src/bindings/ScriptDev2/patches/MaNGOS-XXXX-ScriptDev2.patch"
 
 - Compile MaNGOS (ScriptDev2 will automatically be built when compiling Mangos from here on)
 

patches/MaNGOS-7356-ScriptDev2.patch.gz

@@ -1,22 +1,21 @@
-From c73015a64b7956e7456330c31f2b1070ce36ae8a Mon Sep 17 00:00:00 2001
+From 46317d767d5d2a4622e4e3ad67ec9b6e28b49c60
 From: freghar <[email protected]>
-Date: Thu, 23 Oct 2008 11:39:42 +0200
+Date: Mon, 29 Jun 2009 14:02:50 +0200
 Subject: [PATCH] ScriptDev2 patch commit
 
 Signed-off-by: freghar <[email protected]>
 ---
  configure.ac             |    6 +++++-
- src/bindings/.gitignore  |   12 ++++++++++++
+ src/bindings/.gitignore  |    2 +-
  src/bindings/Makefile.am |    2 +-
  src/mangosd/Makefile.am  |    4 ++--
- 4 files changed, 20 insertions(+), 4 deletions(-)
- create mode 100644 src/bindings/.gitignore
+ 4 files changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index b193e6f..91a54bd 100644
+index 7a1b219..8cc9bfe 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -312,7 +312,11 @@ AC_CONFIG_FILES([
+@@ -276,7 +276,11 @@ AC_CONFIG_FILES([
     src/mangosd/Makefile
     src/mangosd/mangosd.conf.dist
     src/bindings/Makefile
@@ -27,25 +26,17 @@ index b193e6f..91a54bd 100644
 +   src/bindings/ScriptDev2/sql/Makefile
 +   src/bindings/ScriptDev2/sql/Updates/Makefile
  ])
- 
+
  ## Configure ACE, if needed
 diff --git a/src/bindings/.gitignore b/src/bindings/.gitignore
-new file mode 100644
-index 0000000..06df6e6
---- /dev/null
+index eeddf0d..95eebf7 100644
+--- a/src/bindings/.gitignore
 +++ b/src/bindings/.gitignore
-@@ -0,0 +1,12 @@
-+#
-+# NOTE! Don't add files that are generated in specific
-+# subdirectories here. Add them in the ".gitignore" file
-+# in that subdirectory instead.
-+#
-+# NOTE! Please use 'git-ls-files -i --exclude-standard'
-+# command after changing this file, to see if there are
-+# any tracked files which get ignored after the change.
-+#
-+
-+# ScriptDev2 directory
+@@ -11,4 +11,4 @@
+ #
+ # Scripting projects
+ #
+-#universal
 +ScriptDev2
 diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
 index 2cc0efd..f2dbbc7 100644
@@ -54,24 +45,23 @@ index 2cc0efd..f2dbbc7 100644
 @@ -14,4 +14,4 @@
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
+
 -SUBDIRS = universal
 +SUBDIRS = ScriptDev2
 diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am
-index b7106cc..706d8ad 100644
+index d853203..899b141 100644
 --- a/src/mangosd/Makefile.am
 +++ b/src/mangosd/Makefile.am
 @@ -33,8 +33,8 @@ mangos_worldd_SOURCES = \
- 	WorldRunnable.h
- 
+        WorldRunnable.h
+
  ## Link world daemon against the shared library
--mangos_worldd_LDADD = ../bindings/universal/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a  ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
--mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L../../dep/src/g3dlite -L../bindings/universal/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic
-+mangos_worldd_LDADD = ../bindings/ScriptDev2/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a  ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
-+mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L../../dep/src/g3dlite -L../bindings/ScriptDev2/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic
- 
+-mangos_worldd_LDADD = ../bindings/universal/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a  ../../dep/src/g3dlite/libg3dlite.a
+-mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/g3dlite -L../bindings/universal/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic
++mangos_worldd_LDADD = ../bindings/ScriptDev2/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a  ../../dep/src/g3dlite/libg3dlite.a
++mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/g3dlite -L../bindings/ScriptDev2/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic
+
  ## Additional files to include when running 'make dist'
  #  Include world daemon configuration
--- 
+--
 1.5.6.5
-