You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by pm...@apache.org on 2014/12/30 15:43:47 UTC
[1/6] incubator-corinthia git commit: Add external/bin directory
Repository: incubator-corinthia
Updated Branches:
refs/heads/master 01cbf0fdf -> 74030263b
Add external/bin directory
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/a3e5d61b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/a3e5d61b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/a3e5d61b
Branch: refs/heads/master
Commit: a3e5d61bb0f69d0ca81b95c14f8f2c59e4f78274
Parents: 01cbf0f
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Tue Dec 30 20:25:28 2014 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Tue Dec 30 20:25:49 2014 +0700
----------------------------------------------------------------------
external/.gitignore | 1 +
external/bin/README.txt | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/a3e5d61b/external/.gitignore
----------------------------------------------------------------------
diff --git a/external/.gitignore b/external/.gitignore
index 2739ff0..adc3936 100644
--- a/external/.gitignore
+++ b/external/.gitignore
@@ -9,6 +9,7 @@
# Build results
+bin/
lib/
include/
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/a3e5d61b/external/bin/README.txt
----------------------------------------------------------------------
diff --git a/external/bin/README.txt b/external/bin/README.txt
new file mode 100644
index 0000000..8b69606
--- /dev/null
+++ b/external/bin/README.txt
@@ -0,0 +1,2 @@
+Put the downloaded external DLL files here.
+
[6/6] incubator-corinthia git commit: Don't store bin/lib/include
dirs in repository
Posted by pm...@apache.org.
Don't store bin/lib/include dirs in repository
These are only intended to contain relevant files from the downloaded
binary distributions, and excluding them from the repository makes it
simpler to blow them away and replace them with those created by the
script when necessary.
The unistd.h file that was present in the include does not necessary,
because it was only the for zconf.h, but zconf.h does not attempt to
include unistd.h if HAVE_UNISTD_H is not set, as is the case on Windows.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/74030263
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/74030263
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/74030263
Branch: refs/heads/master
Commit: 74030263b8ae49406824ce1b6a8394e2d20e538e
Parents: a480e75
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Tue Dec 30 21:30:22 2014 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Tue Dec 30 21:37:57 2014 +0700
----------------------------------------------------------------------
external/README.txt | 147 ++++++++++++++++++++++++++++++++++++-
external/bin/README.txt | 2 -
external/extract_downloads.sh | 6 ++
external/include/README.txt | 81 --------------------
external/include/unistd.h | 3 -
external/lib/README.txt | 10 ---
6 files changed, 152 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/README.txt
----------------------------------------------------------------------
diff --git a/external/README.txt b/external/README.txt
index 4bf4836..5067bdc 100644
--- a/external/README.txt
+++ b/external/README.txt
@@ -20,4 +20,149 @@ SDL2_image developer files:
We are working on reducing these dependencies.
On a Unix system (and possibly under cygwin), you can run the
-fetch_downloads.sh script to download these.
+fetch_downloads.sh script to download these. The extract_downloads.sh
+script places all the files in the bin, lib, and include
+directories. The result should look like this the listing below.
+
+After building Corinthia, you will need to copy all of the DLL files from
+external/bin into the bin directory within your build directory,
+alongside dfconvert and dftest.
+
+bin/SDL2.dll
+bin/SDL2_image.dll
+bin/iconv.dll
+bin/iconv.exe
+bin/libjpeg-9.dll
+bin/libpng16-16.dll
+bin/libtiff-5.dll
+bin/libwebp-4.dll
+bin/libxml2.dll
+bin/xmlcatalog.exe
+bin/xmllint.exe
+bin/zlib1.dll
+include/SDL.h
+include/SDL_assert.h
+include/SDL_atomic.h
+include/SDL_audio.h
+include/SDL_bits.h
+include/SDL_blendmode.h
+include/SDL_clipboard.h
+include/SDL_config.h
+include/SDL_cpuinfo.h
+include/SDL_endian.h
+include/SDL_error.h
+include/SDL_events.h
+include/SDL_filesystem.h
+include/SDL_gamecontroller.h
+include/SDL_gesture.h
+include/SDL_haptic.h
+include/SDL_hints.h
+include/SDL_image.h
+include/SDL_joystick.h
+include/SDL_keyboard.h
+include/SDL_keycode.h
+include/SDL_loadso.h
+include/SDL_log.h
+include/SDL_main.h
+include/SDL_messagebox.h
+include/SDL_mouse.h
+include/SDL_mutex.h
+include/SDL_name.h
+include/SDL_opengl.h
+include/SDL_opengles.h
+include/SDL_opengles2.h
+include/SDL_pixels.h
+include/SDL_platform.h
+include/SDL_power.h
+include/SDL_quit.h
+include/SDL_rect.h
+include/SDL_render.h
+include/SDL_revision.h
+include/SDL_rwops.h
+include/SDL_scancode.h
+include/SDL_shape.h
+include/SDL_stdinc.h
+include/SDL_surface.h
+include/SDL_system.h
+include/SDL_syswm.h
+include/SDL_test.h
+include/SDL_test_assert.h
+include/SDL_test_common.h
+include/SDL_test_compare.h
+include/SDL_test_crc32.h
+include/SDL_test_font.h
+include/SDL_test_fuzzer.h
+include/SDL_test_harness.h
+include/SDL_test_images.h
+include/SDL_test_log.h
+include/SDL_test_md5.h
+include/SDL_test_random.h
+include/SDL_thread.h
+include/SDL_timer.h
+include/SDL_touch.h
+include/SDL_types.h
+include/SDL_version.h
+include/SDL_video.h
+include/begin_code.h
+include/close_code.h
+include/iconv.h
+include/libxml/DOCBparser.h
+include/libxml/HTMLparser.h
+include/libxml/HTMLtree.h
+include/libxml/SAX.h
+include/libxml/SAX2.h
+include/libxml/c14n.h
+include/libxml/catalog.h
+include/libxml/chvalid.h
+include/libxml/debugXML.h
+include/libxml/dict.h
+include/libxml/encoding.h
+include/libxml/entities.h
+include/libxml/globals.h
+include/libxml/hash.h
+include/libxml/list.h
+include/libxml/nanoftp.h
+include/libxml/nanohttp.h
+include/libxml/parser.h
+include/libxml/parserInternals.h
+include/libxml/pattern.h
+include/libxml/relaxng.h
+include/libxml/schemasInternals.h
+include/libxml/schematron.h
+include/libxml/threads.h
+include/libxml/tree.h
+include/libxml/uri.h
+include/libxml/valid.h
+include/libxml/xinclude.h
+include/libxml/xlink.h
+include/libxml/xmlIO.h
+include/libxml/xmlautomata.h
+include/libxml/xmlerror.h
+include/libxml/xmlexports.h
+include/libxml/xmlmemory.h
+include/libxml/xmlmodule.h
+include/libxml/xmlreader.h
+include/libxml/xmlregexp.h
+include/libxml/xmlsave.h
+include/libxml/xmlschemas.h
+include/libxml/xmlschemastypes.h
+include/libxml/xmlstring.h
+include/libxml/xmlunicode.h
+include/libxml/xmlversion.h
+include/libxml/xmlwriter.h
+include/libxml/xpath.h
+include/libxml/xpathInternals.h
+include/libxml/xpointer.h
+include/zconf.h
+include/zlib.h
+lib/SDL2.lib
+lib/SDL2_image.lib
+lib/SDL2main.lib
+lib/SDL2test.lib
+lib/iconv.lib
+lib/iconv_a.lib
+lib/libxml2.lib
+lib/libxml2_a.lib
+lib/libxml2_a_dll.lib
+lib/zdll.lib
+lib/zlib.def
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/bin/README.txt
----------------------------------------------------------------------
diff --git a/external/bin/README.txt b/external/bin/README.txt
deleted file mode 100644
index 8b69606..0000000
--- a/external/bin/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Put the downloaded external DLL files here.
-
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/extract_downloads.sh
----------------------------------------------------------------------
diff --git a/external/extract_downloads.sh b/external/extract_downloads.sh
index cbfbd5f..0d151e3 100755
--- a/external/extract_downloads.sh
+++ b/external/extract_downloads.sh
@@ -17,6 +17,12 @@ mkdir packages/zlib
(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
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/include/README.txt
----------------------------------------------------------------------
diff --git a/external/include/README.txt b/external/include/README.txt
deleted file mode 100644
index 83b370f..0000000
--- a/external/include/README.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-put the downloaded external header files here.
-
-The content should be:
- zlib.h
- zconf.h
-
- SDL.h
- SDL_main.h
- SDL_image.h
- SDL_stdinc.h
- SDL_config.h
- SDL_platform.h
- SDL_assert.h
- SDL_atomic.h
- SDL_audio.h
- SDL_error.h
- SDL_endian.h
- SDL_mutex.h
- SDL_thread.h
- SDL_rwops.h
- SDL_clipboard.h
- SDL_cpuinfo.h
- SDL_events.h
- SDL_video.h
- SDL_pixels.h
- SDL_rect.h
- SDL_surface.h
- SDL_blendmode.h
- SDL_keyboard.h
- SDL_mouse.h
- SDL_joystick.h
- SDL_gamecontroller.h
- SDL_quit.h
- SDL_gesture.h
- SDL_touch.h
- SDL_keycode.h
- SDL_scancode.h
- SDL_filesystem.h
- SDL_haptic.h
- SDL_hints.h
- SDL_loadso.h
- SDL_log.h
- SDL_messagebox.h
- SDL_power.h
- SDL_render.h
- SDL_system.h
- SDL_timer.h
- SDL_version.h
- begin_code.h
- close_code.h
-
- libxml/tree.h
- libxml/xmlwriter.h
- libxml/xmlversion.h
- libxml/xmlexports.h
- libxml/xmlstring.h
- libxml/xmlregexp.h
- libxml/dict.h
- libxml/xmlmemory.h
- libxml/thread.h
- libxml/globals.h
- libxml/parser.h
- libxml/hash.h
- libxml/valid.h
- libxml/xmlerror.h
- libxml/list.h
- libxml/xmlautomata.h
- libxml/entities.h
- libxml/encoding.h
- libxml/xmlIO.h
- libxml/SAX.h
- libxml/SAX2.h
- libxml/xlink.h
-
- iconv.h
-
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/include/unistd.h
----------------------------------------------------------------------
diff --git a/external/include/unistd.h b/external/include/unistd.h
deleted file mode 100644
index 5f82577..0000000
--- a/external/include/unistd.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/**
- Dummy file to satisfy zconf.h includes
- **/
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/lib/README.txt
----------------------------------------------------------------------
diff --git a/external/lib/README.txt b/external/lib/README.txt
deleted file mode 100644
index d20f6ad..0000000
--- a/external/lib/README.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Put the downloaded external libraries here.
-
-The content should be:
- libxml2.lib
- zlib.h
- libiconv.lib
- SDL2.lib
- SDL2_image.lib
-
-
[5/6] incubator-corinthia git commit: Add script to extract windows
dependencies
Posted by pm...@apache.org.
Add script to extract windows dependencies
This script unzips the archive downloaded by fetch_downloads.sh and puts
the appropriate files in the bin, lib, and include directories.
Some of the library names have been slightly changed in CMakeLists.txt
to match the fact that these scripts use different binary distributions
of the libraries than were used previously.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/a480e751
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/a480e751
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/a480e751
Branch: refs/heads/master
Commit: a480e75191efdc8d1639e284500df695b6ece799
Parents: 8da475b
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Tue Dec 30 21:28:32 2014 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Tue Dec 30 21:28:32 2014 +0700
----------------------------------------------------------------------
CMakeLists.txt | 2 +-
external/.gitignore | 2 +-
external/extract_downloads.sh | 39 ++++++++++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/a480e751/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 274f230..9d1d41a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
${PROJECT_SOURCE_DIR}/external/include)
set(LIB_DIRS
${PROJECT_SOURCE_DIR}/external/lib)
- set(LIBS ${LIBS} libxml2 zlib libiconv SDL2 SDL2_image)
+ set(LIBS ${LIBS} libxml2 zdll iconv SDL2 SDL2_image)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4090 /wd4996")
endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/a480e751/external/.gitignore
----------------------------------------------------------------------
diff --git a/external/.gitignore b/external/.gitignore
index adc3936..ca1dc4d 100644
--- a/external/.gitignore
+++ b/external/.gitignore
@@ -12,4 +12,4 @@
bin/
lib/
include/
-
+download/
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/a480e751/external/extract_downloads.sh
----------------------------------------------------------------------
diff --git a/external/extract_downloads.sh b/external/extract_downloads.sh
new file mode 100755
index 0000000..cbfbd5f
--- /dev/null
+++ b/external/extract_downloads.sh
@@ -0,0 +1,39 @@
+#!/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
+
+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
+
+rm -rf packages
[2/6] incubator-corinthia git commit: Remove NamesTests.c to fix
compilation on windows
Posted by pm...@apache.org.
Remove NamesTests.c to fix compilation on windows
The names directory contains only constants for representing particular
element names, and doesn't need tests. Removing NamesTests.c for the
time being as it inadvertently re-defined the LibTests symbol, which
caused compilation to fail on windows.
The way we use integer values to identify elements in the DOM tree needs
to be re-thought anyway, as it doesn't scale or separate for different
file formats. For example there's no situation in which you would have
ODF and OOXML elements in the same XML document; there needs to be a
separate "namespace", to to speak, of integer tags for each filter, with
common ones like HTML included.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/88d4ac35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/88d4ac35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/88d4ac35
Branch: refs/heads/master
Commit: 88d4ac353cfdbed76351d9f825c8f1b6d8769c8d
Parents: a3e5d61
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Tue Dec 30 20:48:24 2014 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Tue Dec 30 20:50:45 2014 +0700
----------------------------------------------------------------------
DocFormats/core/CMakeLists.txt | 5 -----
DocFormats/core/tests/names/NamesTests.c | 27 ---------------------------
2 files changed, 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/88d4ac35/DocFormats/core/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/core/CMakeLists.txt b/DocFormats/core/CMakeLists.txt
index 927dff0..cfd46cc 100644
--- a/DocFormats/core/CMakeLists.txt
+++ b/DocFormats/core/CMakeLists.txt
@@ -120,9 +120,6 @@ set(GroupSrcNames
src/names/DFXMLNamespaces.c
src/names/DFXMLNamespaces.h)
-set(GroupTestsNames
- tests/names/NamesTests.c)
-
###
@@ -182,7 +179,6 @@ add_library(core OBJECT
${GroupTestsCSS}
${GroupTestsHTML}
${GroupTestsLib}
- ${GroupTestsNames}
${GroupTestsXML})
source_group(src\\common FILES ${GroupSrcCommon})
@@ -195,6 +191,5 @@ source_group(tests\\common FILES ${GroupTestsCommon})
source_group(tests\\css FILES ${GroupTestsCSS})
source_group(tests\\html FILES ${GroupTestsHTML})
source_group(tests\\lib FILES ${GroupTestsLib})
-source_group(tests\\names FILES ${GroupTestsNames})
source_group(tests\\xml FILES ${GroupTestsXML})
set_property(TARGET core PROPERTY FOLDER DocFormats)
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/88d4ac35/DocFormats/core/tests/names/NamesTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/names/NamesTests.c b/DocFormats/core/tests/names/NamesTests.c
deleted file mode 100644
index cbf3bc7..0000000
--- a/DocFormats/core/tests/names/NamesTests.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "DFUnitTest.h"
-#include <stddef.h>
-
-static void test_sample(void)
-{
-}
-
-TestGroup LibTests = {
- "core.lib", {
- { "sample", PlainTest, test_sample },
- { NULL, PlainTest, NULL }
- }
-};
[4/6] incubator-corinthia git commit: Add script to download
dependencies for windows
Posted by pm...@apache.org.
Add script to download dependencies for windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/8da475b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/8da475b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/8da475b7
Branch: refs/heads/master
Commit: 8da475b778581453d1da1bdbc20d72310106410c
Parents: 27e199b
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Tue Dec 30 21:25:19 2014 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Tue Dec 30 21:25:19 2014 +0700
----------------------------------------------------------------------
external/README.txt | 22 +++++++++++++++-------
external/fetch_downloads.sh | 21 +++++++++++++++++++++
2 files changed, 36 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8da475b7/external/README.txt
----------------------------------------------------------------------
diff --git a/external/README.txt b/external/README.txt
index fa95d9a..4bf4836 100644
--- a/external/README.txt
+++ b/external/README.txt
@@ -2,14 +2,22 @@ Download external developer libraries to here, and you dont need to modify CMake
in order to compile on windows you need:
-Zlib developer files from http://gnuwin32.sourceforge.net/packages/zlib.htm
-Iconv developer files from http://gnuwin32.sourceforge.net/packages/libiconv.htm
-libxml2 developer files from ftp://ftp.zlatkovic.com/libxml/64bit/
-SDL2 developer files from https://www.libsdl.org/download-2.0.php
-SDL2_image developer files from https://www.libsdl.org/projects/SDL_image/
+Zlib developer files:
+ http://zlib.net/zlib128-dll.zip
-you might also need:
-unistd.h from http://sourceforge.net/p/mingw/mingw-org-wsl/ci/master/tree/include/
+Iconv developer files:
+ ftp://ftp.zlatkovic.com/libxml/iconv-1.9.2.win32.zip
+libxml2 developer files:
+ ftp://ftp.zlatkovic.com/libxml/libxml2-2.7.8.win32.zip
+
+SDL2 developer files:
+ https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip
+
+SDL2_image developer files:
+ https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.0-VC.zip
We are working on reducing these dependencies.
+
+On a Unix system (and possibly under cygwin), you can run the
+fetch_downloads.sh script to download these.
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8da475b7/external/fetch_downloads.sh
----------------------------------------------------------------------
diff --git a/external/fetch_downloads.sh b/external/fetch_downloads.sh
new file mode 100755
index 0000000..c03b9b3
--- /dev/null
+++ b/external/fetch_downloads.sh
@@ -0,0 +1,21 @@
+#!/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 ..
[3/6] incubator-corinthia git commit: Remove duplicate linkage to
files in core
Posted by pm...@apache.org.
Remove duplicate linkage to files in core
The object files generated from core were being included twice in the
command line to the linker, which was causing a warning under Visual
C++. This was due to an extra (unnecessary) reference to
$<TARGET_OBJECTS:core> in DocFormats/CMakeLists.txt.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/27e199bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/27e199bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/27e199bd
Branch: refs/heads/master
Commit: 27e199bd09bc71165e249763da825e03d72b73cc
Parents: 88d4ac3
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Tue Dec 30 21:03:01 2014 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Tue Dec 30 21:03:20 2014 +0700
----------------------------------------------------------------------
DocFormats/CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/27e199bd/DocFormats/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/CMakeLists.txt b/DocFormats/CMakeLists.txt
index 7bb39bb..ce72d7b 100644
--- a/DocFormats/CMakeLists.txt
+++ b/DocFormats/CMakeLists.txt
@@ -52,8 +52,7 @@ set(GroupObjRoot
$<TARGET_OBJECTS:ooxml>
$<TARGET_OBJECTS:latex>
$<TARGET_OBJECTS:odf>
- $<TARGET_OBJECTS:platform>
- $<TARGET_OBJECTS:core>)
+ $<TARGET_OBJECTS:platform>)