aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWiSo <wiso@xbmc.org>2013-12-24 11:28:43 +0100
committerWiSo <wiso@xbmc.org>2013-12-24 11:28:43 +0100
commit5824572d6eee581af19f8ff52dabda3afa854ea5 (patch)
tree23f153981e19c58f32aba73b1a6957e76fb27af6
parent9a581a0521d0b96f6c4286693de5cdc542b971fd (diff)
[WIN32] changed: used repackaged libxslt and libxml2. No need for the packaging scripts (thanks karlson2k)
-rw-r--r--project/BuildDependencies/scripts/0_package.list2
-rw-r--r--project/BuildDependencies/scripts/libxml2_d.bat15
-rw-r--r--project/BuildDependencies/scripts/libxml2_d.txt2
-rw-r--r--project/BuildDependencies/scripts/libxslt_d.bat15
-rw-r--r--project/BuildDependencies/scripts/libxslt_d.txt2
5 files changed, 2 insertions, 34 deletions
diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list
index d4f6f03bc3..18d1103c92 100644
--- a/project/BuildDependencies/scripts/0_package.list
+++ b/project/BuildDependencies/scripts/0_package.list
@@ -16,6 +16,8 @@ libjpeg-turbo-1.2.0-win32.7z
libnfs-1.6.1-win32.7z
libshairplay-c159ca7-win32.7z
libssh-0.5.0-1-win32.zip
+libxml2-2.7.8_1-win32.7z
+libxslt-1.1.26_1-win32.7z
pcre-8.33_1-win32.7z
python-2.7.5-2-win32.7z
sqlite-3.7.16.1-win32.7z
diff --git a/project/BuildDependencies/scripts/libxml2_d.bat b/project/BuildDependencies/scripts/libxml2_d.bat
deleted file mode 100644
index 54605254ff..0000000000
--- a/project/BuildDependencies/scripts/libxml2_d.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@ECHO ON
-rem libxml2 is needed by libxslt
-
-SET LOC_PATH=%CD%
-SET FILES=%LOC_PATH%\libxml2_d.txt
-
-CALL dlextract.bat libxml2 %FILES%
-
-cd %TMP_PATH%
-
-echo readme.txt > libxml2_exclude.txt
-
-xcopy libxml2-2.7.8-win32\* "%XBMC_PATH%\" /E /Q /I /Y /EXCLUDE:libxml2_exclude.txt
-
-cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libxml2_d.txt b/project/BuildDependencies/scripts/libxml2_d.txt
deleted file mode 100644
index ab83b9d1ae..0000000000
--- a/project/BuildDependencies/scripts/libxml2_d.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-; filename source of the file
-libxml2-2.7.8-win32.7z http://mirrors.xbmc.org/build-deps/win32/
diff --git a/project/BuildDependencies/scripts/libxslt_d.bat b/project/BuildDependencies/scripts/libxslt_d.bat
deleted file mode 100644
index f61128b61a..0000000000
--- a/project/BuildDependencies/scripts/libxslt_d.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@ECHO OFF
-rem libxslt depends on libxml2
-
-SET LOC_PATH=%CD%
-SET FILES=%LOC_PATH%\libxslt_d.txt
-
-CALL dlextract.bat libxslt %FILES%
-
-cd %TMP_PATH%
-
-echo readme.txt > libxslt_exclude.txt
-
-xcopy libxslt-1.1.26-win32\* "%XBMC_PATH%\" /E /Q /I /Y /EXCLUDE:libxslt_exclude.txt
-
-cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libxslt_d.txt b/project/BuildDependencies/scripts/libxslt_d.txt
deleted file mode 100644
index df6eb163da..0000000000
--- a/project/BuildDependencies/scripts/libxslt_d.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-; filename mirror of the file
-libxslt-1.1.26-win32.7z http://mirrors.xbmc.org/build-deps/win32/ \ No newline at end of file