From ccd2fd6c77d2272a67022177bdc1c88f194699b1 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Tue, 2 Oct 2012 19:17:48 +0200
Subject: Update dependency extractor scripts

---
 win32/dep-extract-x64.bat     | 26 --------------------------
 win32/dep-extract-x86.bat     | 26 --------------------------
 win32/deps-extract-x64.bat    |  7 +++++++
 win32/deps-extract-x86.bat    |  7 +++++++
 win32/deps-extract-xp-x64.bat | 26 ++++++++++++++++++++++++++
 win32/deps-extract-xp-x86.bat | 26 ++++++++++++++++++++++++++
 6 files changed, 66 insertions(+), 52 deletions(-)
 delete mode 100644 win32/dep-extract-x64.bat
 delete mode 100644 win32/dep-extract-x86.bat
 create mode 100644 win32/deps-extract-x64.bat
 create mode 100644 win32/deps-extract-x86.bat
 create mode 100644 win32/deps-extract-xp-x64.bat
 create mode 100644 win32/deps-extract-xp-x86.bat

diff --git a/win32/dep-extract-x64.bat b/win32/dep-extract-x64.bat
deleted file mode 100644
index 133c599d..00000000
--- a/win32/dep-extract-x64.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-@echo off
-set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef
-
-cd x64
-::obs 7z x -y *.rpm
-::obs 7z x *.cpio
-::obs del *.cpio
-::obs xcopy /q /s /i usr\x86_64-w64-mingw32\sys-root\mingw\* .
-::obs rmdir /q /s usr
-::obs set OPATH=%PATH%
-::obs set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64
-::obs cd lib
-::obs for %%A in (..\bin\*.dll) do (
-::obs 	gendef %%A
-::obs 	lib /nologo /machine:x64 /def:%%~nA.def
-::obs )
-::obs cd ..
-::obs set PATH=%OPATH%
-7z x -y *.zip
-7z x -y *.7z
-::obs copy /y ..\build\glibconfig-x64.h lib\glib-2.0\include\glibconfig.h
-cd share\locale
-del /q /s atk10.mo
-del /q /s gettext-tools.mo
-del /q /s gettext-runtime.mo
-pause
diff --git a/win32/dep-extract-x86.bat b/win32/dep-extract-x86.bat
deleted file mode 100644
index db087587..00000000
--- a/win32/dep-extract-x86.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-@echo off
-set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef
-
-cd Win32
-::obs 7z x -y *.rpm
-::obs 7z x *.cpio
-::obs del *.cpio
-::obs xcopy /q /s /i usr\i686-w64-mingw32\sys-root\mingw\* .
-::obs rmdir /q /s usr
-::obs set OPATH=%PATH%
-::obs set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE
-::obs cd lib
-::obs for %%A in (..\bin\*.dll) do (
-::obs 	gendef %%A
-::obs 	lib /nologo /machine:x86 /def:%%~nA.def
-::obs )
-::obs cd ..
-::obs set PATH=%OPATH%
-7z x -y *.zip
-7z x -y *.7z
-::obs copy /y ..\build\glibconfig-x86.h lib\glib-2.0\include\glibconfig.h
-cd share\locale
-del /q /s atk10.mo
-del /q /s gettext-tools.mo
-del /q /s gettext-runtime.mo
-pause
diff --git a/win32/deps-extract-x64.bat b/win32/deps-extract-x64.bat
new file mode 100644
index 00000000..33a7fcab
--- /dev/null
+++ b/win32/deps-extract-x64.bat
@@ -0,0 +1,7 @@
+:: run this from a command prompt
+@echo off
+set PATH=%PATH%;%ProgramFiles%\7-zip
+
+cd x64
+7z x *.7z
+pause
diff --git a/win32/deps-extract-x86.bat b/win32/deps-extract-x86.bat
new file mode 100644
index 00000000..dc6e64e8
--- /dev/null
+++ b/win32/deps-extract-x86.bat
@@ -0,0 +1,7 @@
+:: run this from a command prompt
+@echo off
+set PATH=%PATH%;%ProgramFiles%\7-zip
+
+cd Win32
+7z x *.7z
+pause
diff --git a/win32/deps-extract-xp-x64.bat b/win32/deps-extract-xp-x64.bat
new file mode 100644
index 00000000..133c599d
--- /dev/null
+++ b/win32/deps-extract-xp-x64.bat
@@ -0,0 +1,26 @@
+@echo off
+set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef
+
+cd x64
+::obs 7z x -y *.rpm
+::obs 7z x *.cpio
+::obs del *.cpio
+::obs xcopy /q /s /i usr\x86_64-w64-mingw32\sys-root\mingw\* .
+::obs rmdir /q /s usr
+::obs set OPATH=%PATH%
+::obs set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64
+::obs cd lib
+::obs for %%A in (..\bin\*.dll) do (
+::obs 	gendef %%A
+::obs 	lib /nologo /machine:x64 /def:%%~nA.def
+::obs )
+::obs cd ..
+::obs set PATH=%OPATH%
+7z x -y *.zip
+7z x -y *.7z
+::obs copy /y ..\build\glibconfig-x64.h lib\glib-2.0\include\glibconfig.h
+cd share\locale
+del /q /s atk10.mo
+del /q /s gettext-tools.mo
+del /q /s gettext-runtime.mo
+pause
diff --git a/win32/deps-extract-xp-x86.bat b/win32/deps-extract-xp-x86.bat
new file mode 100644
index 00000000..db087587
--- /dev/null
+++ b/win32/deps-extract-xp-x86.bat
@@ -0,0 +1,26 @@
+@echo off
+set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef
+
+cd Win32
+::obs 7z x -y *.rpm
+::obs 7z x *.cpio
+::obs del *.cpio
+::obs xcopy /q /s /i usr\i686-w64-mingw32\sys-root\mingw\* .
+::obs rmdir /q /s usr
+::obs set OPATH=%PATH%
+::obs set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE
+::obs cd lib
+::obs for %%A in (..\bin\*.dll) do (
+::obs 	gendef %%A
+::obs 	lib /nologo /machine:x86 /def:%%~nA.def
+::obs )
+::obs cd ..
+::obs set PATH=%OPATH%
+7z x -y *.zip
+7z x -y *.7z
+::obs copy /y ..\build\glibconfig-x86.h lib\glib-2.0\include\glibconfig.h
+cd share\locale
+del /q /s atk10.mo
+del /q /s gettext-tools.mo
+del /q /s gettext-runtime.mo
+pause
-- 
cgit 1.4.1