corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From orc...@apache.org
Subject incubator-corinthia git commit: external.txt 1.0.1 TODO on COR-21, deletion of *.sh files
Date Sat, 14 Feb 2015 20:09:42 GMT
Repository: incubator-corinthia
Updated Branches:
  refs/heads/master 8fbfecab5 -> 59a3bdf92


external.txt 1.0.1 TODO on COR-21, deletion of *.sh files

The problem in issue COR-21 is reflected in the external.txt TODO and
the *.sh files are deleted since they don't use native Windows functions
and have not been kept in sync with the *.bat versions.


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/59a3bdf9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/59a3bdf9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/59a3bdf9

Branch: refs/heads/master
Commit: 59a3bdf927ceac209f9f55fb34e67650dfbf7074
Parents: 8fbfeca
Author: Dennis Hamilton <orcmid@apache.org>
Authored: Sat Feb 14 12:09:27 2015 -0800
Committer: Dennis Hamilton <orcmid@apache.org>
Committed: Sat Feb 14 12:09:40 2015 -0800

----------------------------------------------------------------------
 external/external.txt         |  9 ++++++++
 external/extract_downloads.sh | 46 --------------------------------------
 external/fetch_downloads.sh   | 21 -----------------
 3 files changed, 9 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/59a3bdf9/external/external.txt
----------------------------------------------------------------------
diff --git a/external/external.txt b/external/external.txt
index 4846554..d6fad4e 100644
--- a/external/external.txt
+++ b/external/external.txt
@@ -70,6 +70,15 @@ MANIFEST
 
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+ TODO:
+  * Make headway on issue COR-21 to either reconcile it or figure out what
+    to do with "malformed" Zip files that create empty directories (a
+    Unix-ism).
+
+ 1.0.1 2015-02-14-11:59 Add TODO
+       Note that the *.sh files are not listed in this manifest.  They are
+       now also removed, since they conflict with changes made to where
+       the externals are unzipped.
  1.0.0 2015-01-08-21:14 Create initial version to account for the files in
        the external\ folder
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/59a3bdf9/external/extract_downloads.sh
----------------------------------------------------------------------
diff --git a/external/extract_downloads.sh b/external/extract_downloads.sh
deleted file mode 100755
index 38b9d6e..0000000
--- a/external/extract_downloads.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mkdir packages
-
-mkdir packages/SDL2
-mkdir packages/SDL2_image
-mkdir packages/iconv
-mkdir packages/libxml2
-mkdir packages/zlib
-
-(cd packages/SDL2 && unzip ../../download/SDL2-devel-2.0.3-VC.zip)
-(cd packages/SDL2_image && unzip ../../download/SDL2_image-devel-2.0.0-VC.zip)
-(cd packages/iconv && unzip ../../download/iconv-1.9.2.win32.zip)
-(cd packages/libxml2 && unzip ../../download/libxml2-2.7.8.win32.zip)
-(cd packages/zlib && unzip ../../download/zlib128-dll.zip)
-chmod -R u+w packages/zlib
-
-for i in bin lib include; do
-    if [ ! -d $i ]; then
-        mkdir $i
-    fi
-done
-
-mv packages/SDL2/SDL2-2.0.3/include/* include
-mv packages/SDL2/SDL2-2.0.3/lib/x86/*.lib lib
-mv packages/SDL2/SDL2-2.0.3/lib/x86/*.dll bin
-
-mv packages/SDL2_image/SDL2_image-2.0.0/include/* include
-mv packages/SDL2_image/SDL2_image-2.0.0/lib/x86/*.lib lib
-mv packages/SDL2_image/SDL2_image-2.0.0/lib/x86/*.dll bin
-
-mv packages/iconv/iconv-1.9.2.win32/include/* include
-mv packages/iconv/iconv-1.9.2.win32/lib/* lib
-mv packages/iconv/iconv-1.9.2.win32/bin/* bin
-
-mv packages/libxml2/libxml2-2.7.8.win32/include/* include
-mv packages/libxml2/libxml2-2.7.8.win32/lib/* lib
-mv packages/libxml2/libxml2-2.7.8.win32/bin/* bin
-
-mv packages/zlib/include/* include
-mv packages/zlib/lib/* lib
-mv packages/zlib/*.dll bin
-
-rm -rf packages

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/59a3bdf9/external/fetch_downloads.sh
----------------------------------------------------------------------
diff --git a/external/fetch_downloads.sh b/external/fetch_downloads.sh
deleted file mode 100755
index c03b9b3..0000000
--- a/external/fetch_downloads.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e
-if [ ! -d download ]; then
-    mkdir download
-fi
-
-URLS="http://zlib.net/zlib128-dll.zip \
-      ftp://ftp.zlatkovic.com/libxml/iconv-1.9.2.win32.zip \
-      ftp://ftp.zlatkovic.com/libxml/libxml2-2.7.8.win32.zip \
-      https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip \
-      https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.0-VC.zip"
-
-cd download
-for url in $URLS; do
-    if [ ! -f $(basename $url) ]; then
-        wget $url
-    fi
-done
-
-cd ..


Mime
View raw message