You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by ja...@apache.org on 2015/07/24 20:05:44 UTC
incubator-corinthia git commit: Windows build 32bit and 64bit
Repository: incubator-corinthia
Updated Branches:
refs/heads/master 60e7f1624 -> f2160f96e
Windows build 32bit and 64bit
This is the first published version of our 32/64bit.
"external" has been removed, since we download all libraries directly from ~jani
It needs to be tested on the other platforms, and the windows buildbot needs to be updated.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/f2160f96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/f2160f96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/f2160f96
Branch: refs/heads/master
Commit: f2160f96eba361019d4d47e36a61e9bcc3fff67a
Parents: 60e7f16
Author: jani <ja...@apache.org>
Authored: Fri Jul 24 20:02:06 2015 +0200
Committer: jani <ja...@apache.org>
Committed: Fri Jul 24 20:02:06 2015 +0200
----------------------------------------------------------------------
.gitignore | 215 +-----------------------------------
CMakeLists.txt | 14 +--
DocFormats/core/CMakeLists.txt | 5 +-
README.md | 5 +-
external/.gitignore | 15 ---
external/README.txt | 184 ------------------------------
external/customize.txt | 110 ------------------
external/external.txt | 85 --------------
external/extract_downloads.bat | 125 ---------------------
external/fetch_downloads.bat | 40 -------
external/maintenance.txt | 166 ----------------------------
external/unzip-win.js | 46 --------
external/wget-win.js | 30 -----
13 files changed, 14 insertions(+), 1026 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ffac316..edb74d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# .gitignore UTF-8 2014-12-29
+# .gitignore UTF-8 2015-05-17
#
# CORINTHIA/ROOT
# ==============
@@ -10,220 +10,11 @@
# part of a structure where anyone can do multiple flavors of builds
# along-side the source without cluttering the repository iself.
-## ORIGINAL EXCLUSIONS
-## -------------------
-
-.DS_Store
-DerivedData/
-project.xcworkspace/
-xcuserdata/
-*.xccheckout
-
-## ELIMINATION OF VISUAL STUDIO SOLUTIONS
-## --------------------------------------
-
-# Do not include working solutions in the repository tree. Shared
-# solutions are obtained from archives so working solutions are only local,
-# preventing cross-pollution of settings and configurations, debugging
-# preferences, etc.
-
-*.sln
-*.vcxproj
-*.vcxproj.filters
-
-## ELIMINATION OF VISUAL STUDIO ARTIFACTS (Based on GitHub List)
-## -------------------------------------------------------------
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons. These are
-## automatically included when a GitHub creation occurs and
-## Microsoft platforms are targeted.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-build/
-build.32/
-bld/
-[Bb]in/
-[Oo]bj/
-
-# Roslyn cache directories
-*.ide/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-#NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding addin-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be
-# unencrypted
-*.pubxml
-*.publishproj
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# If using the old MSBuild-Integrated Package Restore, uncomment this:
-#!**/packages/repositories.config
-
-# Windows Azure Build Output
-csx/
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-*~*
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-TAGS
-*.patch
-
-# Emacs
-*#*
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
+build*/
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
+# External downloads
-# Microsoft Fakes
-FakesAssemblies/
# *** end of .gitignore ***
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d6a82c..db45428 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,24 +32,24 @@ set(LIBS )
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
find_library(FOUNDATION_LIBRARY Foundation)
find_library(IMAGEIO_LIBRARY ImageIO)
+ set(INCLUDE_DIRS /usr/include/libxml2)
set(LIBS ${LIBS} xml2 z ${FOUNDATION_LIBRARY} ${IMAGEIO_LIBRARY})
endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_C_FLAGS "-std=c99 -D_GNU_SOURCE -g -fPIC")
+ set(INCLUDE_DIRS /usr/include/libxml2)
set(LIBS ${LIBS} m pthread xml2 z SDL2 SDL2_image)
endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- set(INCLUDE_DIRS
- ${PROJECT_SOURCE_DIR}/external/download/include)
- set(LIB_DIRS
- ${PROJECT_SOURCE_DIR}/external/download/lib)
- set(LIBS ${LIBS} libxml2 zdll iconv SDL2 SDL2_image)
+ set(INCLUDE_DIRS ${CMAKE_BINARY_DIR}/target_include)
+ set(LIB_DIRS ${CMAKE_BINARY_DIR}/target_lib)
+ set(CMAKE_C_FLAGS "/DWIN64 /D_WINDOWS /W3 /wd4090 /wd4996")
if(${CMAKE_GENERATOR_PLATFORM} MATCHES "x64")
- set(CMAKE_C_FLAGS "/DWIN64 /D_WINDOWS /W3 /wd4090 /wd4996")
+ set(LIBS ${LIBS} libxml2_64 zlibwapi64 iconv64 SDL2_64 SDL2_image_64)
else(${CMAKE_GENERATOR_PLATFORM} MATCHES "x64")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4090 /wd4996")
+ set(LIBS ${LIBS} libxml2 zlibwapi iconv SDL2 SDL2_image)
endif(${CMAKE_GENERATOR_PLATFORM} MATCHES "x64")
endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/DocFormats/core/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/core/CMakeLists.txt b/DocFormats/core/CMakeLists.txt
index 02212cc..fcd8b29 100644
--- a/DocFormats/core/CMakeLists.txt
+++ b/DocFormats/core/CMakeLists.txt
@@ -146,11 +146,10 @@ set(GroupTestsXML
# Common include for all core files
###
include_directories()
-include_directories(/usr/include/libxml2)
-include_directories(../../DocFormats/platform/3rdparty/w3c-tidy-html5/include)
-include_directories(../../DocFormats/platform/3rdparty//w3c-tidy-html5/src)
include_directories(SYSTEM ${INCLUDE_DIRS})
include_directories(SYSTEM ../api/headers)
+include_directories(../../DocFormats/platform/3rdparty/w3c-tidy-html5/include)
+include_directories(../../DocFormats/platform/3rdparty//w3c-tidy-html5/src)
include_directories(src/common)
include_directories(src/css)
include_directories(src/html)
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 6d13b95..f15ec4f 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,7 @@ your own program.
# Platforms and dependencies
-Corinthia builds and runs on iOS, OS X, and Linux. Windows support is in the
-works.
+Corinthia builds and runs on iOS, OS X, Linux and Windows.
To build DocFormats, you will need to have the following installed:
@@ -89,7 +88,7 @@ To build DocFormats, you will need to have the following installed:
# Build instructions
-Corinthia currently builds on Linux and OS X (mac). See the [build instructions](https://github.com/uxproductivity/Corinthia/wiki/Build-instructions).
+Corinthia currently builds on Linux, OS X (mac) and Windows. See the [build instructions](https://cwiki.apache.org/confluence/display/Corinthia/Build+instructions).
# Contributing
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/external/.gitignore
----------------------------------------------------------------------
diff --git a/external/.gitignore b/external/.gitignore
deleted file mode 100644
index ca1dc4d..0000000
--- a/external/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-# .gitignore UTF-8 2014-12-29
-#
-# CORINTHIA/external
-# ==============
-#
-# .GITIGNORE FOR KEEPING EXTERNAL DOWNLOADS OUT OF THE REPOSITORY
-#
-# This .gitignore file is designed to eliminate external downloads.
-
-
-# Build results
-bin/
-lib/
-include/
-download/
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/external/README.txt
----------------------------------------------------------------------
diff --git a/external/README.txt b/external/README.txt
deleted file mode 100644
index 7c5ad65..0000000
--- a/external/README.txt
+++ /dev/null
@@ -1,184 +0,0 @@
-README.txt 1.1.1 UTF-8
-
- EXTERNAL DOWNLOADS SETUP AND USE
- ================================
-
-The Corinthia repository external/ area is a section of the repository used
-for downloading external dependencies required in constructing Corinthia code.
-These dependencies are required when constructing Corinthia components on and
-for Microsoft Windows.
-
-The downloads are created in an externals\download\ subdirectory. This is
-not part of the repository and is created in a local working copy whenever
-needed. The scripts in externals\ provide the necessary downloading and
-organization of the external material.
-
-The files directly in externals\ level provide documentation and scripts for
-carrying out the download and extraction of material that Corinthia components
-depend on for their compilation and executable operation. These files are
-part of the Corinthia source code repository and are maintained with it.
-
-There are two uses for the externals\ source code,
-
- 1. as maintained scripts for downloading the current dependencies into
- the download/ folder in a form that is used by build procedures where
- these dependencies matter,
-
- 2. as templates for introducing other download folders that a project
- may require as part of its capture of external material that is
- needed on Microsoft Windows.
-
-
- CONTENT
- 1. Prerequisites for Using the Scripts
- 2. Operation
- 3. Compile-Time Dependency on the External/Download Content
- 4. External Files to be Included with Corinthia Software on Windows
- 5. Maintenance and Customization Procedures
- 6. Caveats
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- 1. PREREQUISITES FOR USING THE SCRIPTS
- -----------------------------------
-
-To use these scripts, it is necessary to have an Internet Connection and be
-on a Microsoft Windows platform. Operation can be in a properly-connected
-Virtual Machine guest having an installed Windows Operating System. The
-operating system can be either x86 or x64 based.
-
-The procedures employ Microsoft Windows batch (.bat) files and rely on the
-Windows Scripting Host (WSH) for JScript access to Windows utility functions.
-The Windows Command Extensions must be in effect. (These are usually set by
-default and Visual Studio scripts depend on them also.)
-
-The scripts can be executed using a console shell of the user's choice. They
-have been tested using Windows cmd.exe, Windows PowerShell, MSYS2 (bash),
-CygWin (bash) and JSoft Take Command (formerly 4NT and 4DOS). They have been
-operated on Windows XP, Windows 8.1 Pro x64 and Windows 10 x64 Technical
-Preview as of January, 2015.
-
-
- 2. OPERATION
- ---------
-
-In a console session, simply arrange to execute the script
-
- external\extract_downloads.bat
-
-wherever it is located on the local system. The other script files are used
-as needed to complete the extraction operations. The script will operate
-relative to its own location, not where it is executed from. That is,
-the downloads\ sub-folder is always created in the same folder that holds
-extract_downloads.bat and the other scripts.
-
-The external\download\ folder will be created if needed. Any external package
-that is not yet downloaded will be fetched from the Internet. Already-
-downloaded packages will not be downloaded again. (To force a fresh set of
-downloads, simply delete the download\ subfolder.)
-
-The external packages will be stored in external\downloads\ and will remain
-there for any future use so long as that folder is preserved.
-
-If the set of external packages is complete, they will then be expanded into
-download\include\, download\lib\, and download\bin\ subdirectories with the
-files needed for compilation and execution of code that relies on the external
-dependencies.
-
-This extraction is done completely each time extract_downloads is operated.
-Extraction is not performed if any of the package downloads are missing.
-
-
- 3. COMPILE-TIME DEPENDENCY ON THE EXTERNAL/DOWNLOAD CONTENT
- --------------------------------------------------------
-
-The population of external\downloads\ is presumed in the root CMakeLists.txt
-file in the 'if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")' entry. That
-definition and the current structure here must be kept synchronized.
-
-These externals are for builds targeted to Win32 x86 runtime only. Externals
-needed for producing x64 executables require a different arrangement.
-
-
- 4. EXTERNAL FILES TO BE INCLUDED WITH CORINTHIA SOFTWARE ON WINDOWS
- ----------------------------------------------------------------
-
-The external\download\ folder is populated with include\, lib\, and bin\
-subfolders that carry extracted material that Corinthia code depends on when
-compiled for Windows.
-
-The compiled executables will need to be installed in folders that also have
-copies of DLLs from external\download\bin\
-
- iconv.dll
- libjpeg-9.dll
- libpng16-16.dll
- libtiff-5.dll
- libwebp-4.dll
- libxml2.dll
- SDL2.dll
- SDL2_image.dll
- zlib1.dll
-
-The license files in bin\ are to be carried along with the DLL files they
-apply to.
-
-Not every Corinthia component requires all of these DLLs. For finer details,
-consult information on the individual component.
-
-
- 5. MAINTENANCE AND CUSTOMIZATION PROCEDURES
- ----------------------------------------
-
- The file maintenance.txt provides more information on how to perform
- basic maintenance on these procedures.
-
- The file customize.txt provides more information on adaptation of
- the procedures for use in a differen location and download situation.
-
- 6. CAVEATS
- -------
-
- The Windows Command Extensions must be enabled for the .bat scripts to
- work properly.
-
- The Windows file system is case insensitive. Any two file names and URLs
- that differ only in case will collide. There are also more restrictions
- on special characters. E.g., ":" may not be used in file names and "\"
- is the path separator (not "/" which is also restricted).
-
- The scripts can be unsuccessful without any failure indication. It is
- necessary to use troubleshooting procedures to confirm that a download
- is failing or that an extraction is not producing the expected content.
- It is possible for a download to fail with a delivered but incorrect
- file.
-
-
-REVISIONS
-
- 1.1.1 2015-01-12-19:24 Stray word removed from the list of DLLs in Section 4
- 1.1.0 2015-01-08-21:20 Updated Draft with complete coverage
- 1.0.0 2015-01-08-15:21 Initial Draft replacement of the original README.txt
-
-
- *** end of README.txt ***
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/external/customize.txt
----------------------------------------------------------------------
diff --git a/external/customize.txt b/external/customize.txt
deleted file mode 100644
index cb98e2f..0000000
--- a/external/customize.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-customize.txt 1.0.0 UTF-8 2015-01-08
-
- CUSTOMIZING EXTERNAL DOWNLOADS FOR OTHER DOWNLOADS
- ==================================================
-
- The external\ folder holds scripts and the download\ sub-folder for
- external software that Corinthia Windows Win32 x86 builds depend on.
-
- Note: This repository folder is intended to be usable when cloned to a
- Microsoft platform. The notation for file paths reflects that, even
- though POSIX path notation is used in the git and when viewed on GitHub.
-
-BASIC CUSTOMIZATION APPROACH
-
-The files, listed below, can be moved in their entirety to a new folder
-location where download of external materials is desired.
-
-The scripts are designed to operate relative to where they are stored. So
-if the scripts are moved to a folder named test-documents\, they will produce
-and populate a further sub-folder, either named download\ or a different name
-that is customized.
-
-One can make further modifications that deviate further from this structure.
-It is useful to make such changes in stages to ensure that the new organiza-
-tion is being honored correctly.
-
-Once the eight files are moved to their intended new home, customization at
-the detail is similar to following the maintenance procedure with allowance
-for the changes in location and desired operation.
-
-FILES TO MODIFY
-
- .gitignore
- Change the name of the download\ subfolder here if a different
- folder outside of the managed source tree is used.
-
- fetch_downloads.bat
- The "download" name must be replaced everywhere that a different
- folder name is to be used as the location of downloaded files. The
- number of downloads and the names will also be changed by creation
- of appropriate :FETCH calls in place of the ones in the script.
-
- extract_downloads.bat
- The "download" name must be replaced everywhere that a different
- folder name is to be used as the location of the downloaded files
- and of the new directories created as part of the extraction. Note
- that all extractions of Zips are into a subfolder "T\" and then the
- extracts are selectively moved to other places in the chosen download\
- location. This procedure requires the greatest customization
- depending on the purpose of the download procedure.
-
- README.txt
- replace with appropriate text, if needed at all.
-
- customize.txt
- this file can be kept unchanged or touched-up slightly for the new
- location. Alternatively, simply refer to the originals that were
- customized, linking to where this procedure was found.
-
- maintenance.txt
- This can still apply, depending on how much difference there is,
- especially in the extraction process. Most of the advice remains
- applicable.
-
- unzip-win.js
- This helper script takes the archive filename and the destination
- folder as parameters. It does not need to be modified.
-
- wget-win.js
- This helper script takes the URL and the download location as
- parameters. It does not need to be modified.
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
-
-TODO
-
- * Add maintainance.txt for the maintenance procedure for the scripts in their
- original external\ portion of the Corinthia repository.
-
- * Add customize.txt for the procedure for customizing the scripts in another
- location or project.
-
- * Update README.txt to reflect these when present.
-
- * Add Apache license notice to anything of much length.
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- 1.0.0 2015-01-08-16:48 Create initial version to account for the way
- the scripts will produce different download folders in other places.
-
- *** end of customize.txt ***
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/external/external.txt
----------------------------------------------------------------------
diff --git a/external/external.txt b/external/external.txt
deleted file mode 100644
index d6fad4e..0000000
--- a/external/external.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-external.txt 1.0.0 UTF-8 2015-01-08
-
- CORINTHIA EXTERNAL DOWNLOADS FOR WINDOWS x86 BUILDS
- ===================================================
-
- The external\ folder holds scripts and the download\ sub-folder for
- external software that Corinthia Windows Win32 x86 builds depend on.
-
- Note: This repository folder is intended to be usable when cloned to a
- Microsoft platform. The notation for file paths reflects that, even
- though POSIX path notation is used in the git and when viewed on GitHub.
-
-
-MANIFEST
-
- external.txt
- This summary, manifest and work-item file for activity in this
- external folder
-
- .gitignore
- Rule for excluding the download\ subfolder from the repository
-
- extract_downloads.bat
- Windows console session batch file for fetching and extracting
- the external packages
-
- fetch_downloads.bat
- Windows console session batch file for fetching the external
- packages to download\ without extracting anything; used by
- extract_downloads to retrieve any packages not downloaded yet
-
- README.txt
- general description of the procedures and their usage
-
- customize.txt
- description of general procedure for customizing the procedures
- in creating downloads on Windows for other purposes
-
- maintenance.txt
- description of the basic maintenance and modification-testing when
- these procedures are updated and/or customized
-
- unzip-win.js
- helper JScript file used by extract_downloads to extract all
- of the files in a Zip into a specified desktop folder
-
- wget-win.js
- helper JScript file used by fetch_downloads to make web requests
- for downloading of specified URLs to specific download locations.
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- 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
-
- *** end of external.txt ***
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/external/extract_downloads.bat
----------------------------------------------------------------------
diff --git a/external/extract_downloads.bat b/external/extract_downloads.bat
deleted file mode 100644
index ffeedf2..0000000
--- a/external/extract_downloads.bat
+++ /dev/null
@@ -1,125 +0,0 @@
-@echo off
-rem extract_downloads.bat 1.1.0 UTF-8
-rem EXTRACT THE EXTERNAL DOWNLOADS TO INCLUDE, LIB, AND BIN FOLDERS
-
-rem Fetch downloads in case not done yet
-CALL "%~dp0fetch_downloads.bat"
-
-rem Determine if any of the packages are missing
-SET extract_downloads=
-CALL :CHECKON zlib128-dll.zip
-CALL :CHECKON iconv-1.9.2.win32.zip
-CALL :CHECKON libxml2-2.7.8.win32.zip
-CALL :CHECKON SDL2-devel-2.0.3-VC.zip
-CALL :CHECKON SDL2_image-devel-2.0.0-VC.zip
-
-rem This procedure can't proceed unless all are present
-IF NOT "%extract_downloads%" == "" GOTO :FAIL1
-
-CALL :CLEAN
-
-rem For extractions, use the zip name listed and the path, if any, from the
-rem root of the zipped hierarchy to the level where include and libs are found
-
-rem File Name Top Path
-CALL :SDL2x86 SDL2-devel-2.0.3-VC.zip SDL2-2.0.3\
-CALL :SDL2x86 SDL2_image-devel-2.0.0-VC.zip SDL2_image-2.0.0\
-CALL :ICONV iconv-1.9.2.win32.zip iconv-1.9.2.win32\
-CALL :LIBXML2 libxml2-2.7.8.win32.zip libxml2-2.7.8.win32\
-CALL :ZLIB zlib128-dll.zip ""
-
-EXIT /B 0
-
-rem MOST MAINTENANCE IS BY UPDATING THE FILENAMES AND TOP PATHS ABOVE.
-rem The extraction procedure do not require maintenance unless there is
-rem a Zip layout change or new extraction cases are needed.
-
-rem CUSTOM EXTRACTION CASES FOR COLLECTING EXTERNAL INCLUDES, LIBS, AND BINS
-rem Each one of these cases below accepts two parameters
-rem %1 is the filename of the zip file, to be unzipped from
-rem %~dp0download\%1 with expansion to folder %~dp0download\T
-rem %2 is the path from T to the level at which parts like include
-rem and lib are to be found. %2 is either empty or it is one or more
-rem path segments each ending with "\".
-
-:SDL2x86
-rem taking T\%2include and T\%2lib\*.lib across, with T\%2lib\*.dll to bin
-rem move any license *.txt files to the bin also.
-CALL :UNZIP %1
-XCOPY "%~dp0download\T\%2include\*.*" "%~dp0download\include" /I /Q /Y >nul
-XCOPY "%~dp0download\T\%2lib\x86\*.lib" "%~dp0download\lib" /I /Q /Y >nul
-XCOPY "%~dp0download\T\%2lib\x86\*.dll" "%~dp0download\bin" /I /Q /Y >nul
-XCOPY "%~dp0download\T\%2lib\x86\*.txt" "%~dp0download\bin" /I /Q /Y >nul 2>&1
-EXIT /B 0
-
-:ICONV
-rem taking T\%2include, T\%2lib, and T\%2bin\*.dll across
-CALL :UNZIP %1
-XCOPY "%~dp0download\T\%2include\*.*" "%~dp0download\include" /I /Q /Y >nul
-XCOPY "%~dp0download\T\%2lib\*.*" "%~dp0download\lib" /I /Q /Y >nul
-XCOPY "%~dp0download\T\%2bin\*.dll" "%~dp0download\bin" /I /Q /Y >nul
-EXIT /B 0
-
-:LIBXML2
-rem taking T\%2include\libxml\, T\%2lib, and T\%2bin\*.dll across
-CALL :UNZIP %1
-XCOPY "%~dp0download\T\%2include\libxml\*.*" "%~dp0download\include\libxml" /I /Q /Y >nul 2>&1
-XCOPY "%~dp0download\T\%2lib\*.*" "%~dp0download\lib" /I /Q /Y >nul
-XCOPY "%~dp0download\T\%2bin\*.dll" "%~dp0download\bin" /I /Q /Y >nul
-EXIT /B 0
-
-:ZLIB
-rem taking all across from T\%2include and T\%2lib, with T\%2*.dll to bin
-CALL :UNZIP %1
-XCOPY "%~dp0download\T\%2include\*.*" "%~dp0download\include" /I /Q /Y >nul
-XCOPY "%~dp0download\T\%2lib\*.*" "%~dp0download\lib" /I /Q /Y >nul
-XCOPY "%~dp0download\T\%2*.dll" "%~dp0download\bin" /I /Q /Y >nul
-EXIT /B 0
-
-:UNZIP
-rem EXTRACT ALL OF ZIP "%~dp0download\%1" TO "%~dp0download\T"
-rem "%~dp0download\T" is not deleted until needed again, leaving the
-rem last one for inspection when trouble-shooting.
-RMDIR /S /Q "%~dp0download\T" >nul 2>&1
-ECHO: extracting %1
-Cscript /nologo "%~dp0unzip-win.js" //B "%~dp0download\%1" "%~dp0download\T"
-EXIT /B 0
-
-:CHECKON
-IF EXIST "%~dp0download\%1" EXIT /B 0
-IF "%extract_downloads%" == "" ECHO:
-ECHO: *** %1 UNAVAILABLE FOR EXTRACTION
-SET extract_downloads=0
-EXIT /B 2
-
-:CLEAN
-rem clean out any previous material and be quiet about it
-RMDIR /S /Q "%~dp0download\include" >nul 2>&1
-RMDIR /S /Q "%~dp0download\lib" >nul 2>&1
-RMDIR /S /Q "%~dp0download\bin" >nul 2>&1
-rem set up empty include, lib, and bin to receive fresh extractions
-MKDIR "%~dp0download\include"
-MKDIR "%~dp0download\lib"
-MKDIR "%~dp0download\bin"
-EXIT /B 0
-
-:FAIL1
-SET extract_downloads=
-ECHO: *** EXTRACTION REQUIRES ALL OF THE DOWNLOADS TO BE AVAILABLE
-ECHO: *** Ensure that the archives downloaded by fetch_downloads.bat and
-ECHO: *** expected here are the same. If the unavailable archives are
-ECHO: *** no longer found at the URLs used in fetch_downloads.bat, find
-ECHO: *** alternative locations for them.
-ECHO: *** No extractions have been performed.
-ECHO:
-EXIT /B 2
-
-rem 1.1.0 2015-01-08-14:41 Extract SDL2 Licenses
-rem The license files are added to the bin\ extraction.
-rem 1.01 2015-01-02-17:03 Silence warnings when removing non-existent
-rem directories
-rem 1.00 2015-01-02-16:25 Complete Full-Functioning Externals Extraction
-rem Delivering the download\include, donwload\lib, and download\bin
-rem collections established for the current external downloads.
-
-rem *** end of extract_downloads.bat ***
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/external/fetch_downloads.bat
----------------------------------------------------------------------
diff --git a/external/fetch_downloads.bat b/external/fetch_downloads.bat
deleted file mode 100644
index 08a815b..0000000
--- a/external/fetch_downloads.bat
+++ /dev/null
@@ -1,40 +0,0 @@
-@echo off
-rem fetch_downloads.bat 1.1.0 UTF-8
-rem FETCH EXTERNAL ARCHIVES FOR NATIVE WINDOWS BUILDS OF CORINTHIA
-
-MKDIR "%~dp0download" >nul 2>&1
-rem Make download directory at same location as this script.
-rem Be silent even if the directory already exists. No worries.
-
-rem MAINTAIN THIS LIST MANUALLY. MATCH UP IN EXTRACT_DOWNLOADS.BAT
-CALL :FETCH "http://zlib.net/zlib128-dll.zip"
-CALL :FETCH "http://xmlsoft.org/sources/win32/iconv-1.9.2.win32.zip"
-CALL :FETCH "http://xmlsoft.org/sources/win32/libxml2-2.7.8.win32.zip"
-CALL :FETCH "https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip"
-CALL :FETCH "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.0-VC.zip"
-EXIT /B 0
-
-:FETCH
-IF EXIST "%~dp0download\%~n1%~x1" EXIT /B 0
-rem do not download an archive that is already present.
-Cscript /nologo "%~dp0wget-win.js" //B "%1" "%~dp0download\%~n1%~x1"
-rem This procedure always succeeds. It needs some error handling.
-IF EXIST "%~dp0download\%~n1%~x1" ECHO: %~n1%~x1% downloaded
-EXIT /B 0
-
-
-rem TODO
-rem * It might be handy to fetch these URLs from a file so that it can
-rem be kept maintained in one place, even though the win32 cases are
-rem unique to building for Windows.
-rem XXX
-rem * wget-win.js does not do FTP. So alternative locations have been
-rem used for iconv and libmxl2.
-
-rem 1.1.0 2015-01-08-18:42 Adjust to line up with maintenance description
-rem The TODO list is updated. The always successful :FETCH noted.
-rem 1.00 2015-01-02-16:51 Complete with mating to extract_downloads.bat
-rem The tested version is adjusted to list successful downloads
-rem and not any that are not needed or fail.
-
-rem *** end of fetch_downloads.bat ***
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/external/maintenance.txt
----------------------------------------------------------------------
diff --git a/external/maintenance.txt b/external/maintenance.txt
deleted file mode 100644
index 17c6c21..0000000
--- a/external/maintenance.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-maintenance.txt 1.0.0 UTF-8 2015-01-08
-
- MAINTAIN THE EXTERNAL DOWNLOADS PROCEDURES
- ==========================================
-
- The external\ folder holds scripts that provide for specific downloads
- to be obtained over the internet and retained in a download\ sub-folder.
- The scripts also provide for the extraction of code and libraries from
- the downloaded archives and making them available for use in builds on
- Windows and in deployed packages on Windows.
-
- When the source or version of downloads change, and other downloads are
- added, these procedures must be maintained. Almost all of the maintenance
- and related customization is in the two procedure fetch_downloads.bat
- and extract_downloads.bat.
-
- There are interdependencies among the two scripts and within the second
- script that must be maintained and carefully verified.
-
- This file provides guidance on how to preserve correct, tested operation
- as maintenance and customization are performed.
-
-MAINTAINING FETCH_DOWNLOADS.BAT
--------------------------------
-
-CREATING THE DOWNLOAD\ SUB-FOLDER
-
-This file creates the download\ subdirectory in the same folder as the script
-when it is not present already. It does not remove anything from a folder
-that is already there.
-
-The single command
-
- MKDIR "%~dp0download" >nul 2>&1
-
-accomplishes that. The script parameter %~dp0 uses the drive and path of
-the location of the script itself (ending in "\") and appends the download
-name for the desired subdirectory. (This scheme is used throughout the
-scripts.) Any console output is routed to nul, and any error message output
-is routed to the same place as the console. This eliminates nuisance warnings
-about directories already existing, etc.
-
-DOWNLOADING THE EXTERNAL CONTENT
-
-Each download is accomplished with one of the lines that performs a
-CALL :FETCH operation. The one parameter on the same line is the full URL
-of a file to download.
-
-There are two important variables to observe. The full URL must be the
-complete location for accessing the file on the Internet using HTTP. The
-downloads must use HTTP in this implementation.
-
-Furthermore, the name by which the download will be stored will be the
-file name at the end of the URL. The :FETCH procedure takes apart the
-URL and specifies the correct file name to use when storing in the download\
-folder.
-
-The fetch_downloads.bat procedure is mostly silent. If it is discovered
-that a file to be downloaded is already present, it is left intact and not
-downloaded again. If there is a download operation, and the file is present
-afterwards, the name of the file is announced on the console. And if that
-download fails, there is also silence.
-
-TESTING AND TROUBLE-SHOOTING
-
-If there is any doubt about a download, the easiest way to determine if it
-is working is by putting the URL in the address bar of a browser and seeing
-whether the file is delivered.
-
-It is possible to run fetch_downloads.bat multiple times. Once all of the
-files are all present (if downloadable), there will be no further output.
-Look in the download\ directory to see what files are present.
-
-It may be necessary to trouble-shoot collisions of names that are the same
-when case is ignored, and there can be other problems with special characters
-that are not permitted in Windows file names (or that are reserved names, like
-"nul").
-
-Finally, the wget-win.js never fails, and it will always store *something*
-at the destination location. This can lead to file-not-found messages in the extract_downloads.bat script.
-
-
-MAINTAINING EXTRACT_DOWNLOADS.BAT
----------------------------------
-
-The extract_downloads.bat script first does a CALL fetch_downloads.bat. This
-does no harm and it automatically obtains the downloads if they are not there
-already.
-
-CHECKING THAT THE DOWNLOADS ARE PRESENT
-
-The first part of extract_downloads.bat is a series of CALL :CHECK commands.
-Each one of these names one of the downloads that should now be present.
-If they are not all there, the procedure will report that and stop.
-
-The important feature of the CALL :CHECK commands is they must list exactly
-the same files that are specified in the CALL :FETCH commands in
-fetch_downloads.bat. These are the names the files should have been stored
-with.
-
-It is possible that a file is present but it is incorrect. This will usually
-show up with unusual results from the extract operations.
-
-PERFORMING EXTRACTIONS
-
-The actual extraction procedure is very specific to the individual downloads.
-There is some abstraction into general, reusable procedures, but they are
-still very specific to the nature of the download.
-
-There is a consistent extraction API for these custom routines. The first
-parameter is the name of the downloaded file. This should agree with the
-name in the CALL :CHECK operation.
-
-The second parameter indicates where inside of a Zip, the interesting data
-starts. Many of the Zip files unload a single directory as their top level
-and then the actual payload is at the level below that directory. When that
-is the case, the path prior to the payload is specified with a non-empty
-second parameter.
-
-This can be seen by examining some of the calls and comparing with how the
-Zip files are organized by inspecting them in the Windows file system.
-
-What's important:
- 1. When an existing download is upgraded to use a new version, the file name
- will change and so many any second parameter, since it often is a folder
- whose name is based on the version of the related library.
- 2. When an existing download is upgraded, the structure of the main material
- may change, so a different set of XCOPY operations may be required to
- extract the material correctly.
-
-This is even more involved when a new custom download is introduced.
-
-TESTING AND TROUBLESHOOTING
-
-The easiest way to test individual extractions is to remark-out all of the
-CALL procedures but the one to be tested. The extraction from the one
-archive can be seen in the download\T\ folder, and one can verify the
-download\include\, download\lib\, and download\bin results manually.
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- 1.0.0 2015-01-08-19:12 Create initial version to account for the way
- the scripts operate and will need to be modified on upgrades of
- any of the downloads.
-
- *** end of maintenance.txt ***
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/external/unzip-win.js
----------------------------------------------------------------------
diff --git a/external/unzip-win.js b/external/unzip-win.js
deleted file mode 100644
index 8c89e19..0000000
--- a/external/unzip-win.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* unzip-win.js 1.00 UTF-8
- * USE WINDOWS SHELL TO EXTRACT ALL FROM ZIPS
- *
- * Cscript unzip-win.js zip dest
- * performas an "extract all" of the zip to the dest folder, where
- *
- * zip is the full path file location of the zip to extract
- * dest is the full path of the folder to which extraction occurs
- *
- * This is a helper script designed to be used with a larger script or
- * batch file that provides clean parameters and usage.
- *
- * The present script is adapted from the solution by Greg Zakharov at
- * <http://stackoverflow.com/a/19711019/33810> on 2013-10-31.
- *
- * TODO
- * It is a little startling when the Windows copying-files animation
- * pops up when one of these runs long enough for its visibility.
- * Find a way to inhibit that, if possible.
- */
-
-
-try
-{ var zip = WScript.Arguments(0);
- var dest = WScript.Arguments(1);
-
- with (new ActiveXObject('Scripting.FileSystemObject'))
- {
- if (!FolderExists(dest)) CreateFolder(dest);
- with (new ActiveXObject('Shell.Application'))
- {
- NameSpace(GetFolder(dest).Path)
- .CopyHere(Namespace(GetFile(zip).Path).Items());
- }
- }
-}
-catch (e)
-{
- WScript.echo(e.message);
-}
-
-/* 1.00 2015-01-02 Complete Adaptation for Corinthia Externals Extraction
- */
-
-/* *** end of unzip-win.js *** */
-
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f2160f96/external/wget-win.js
----------------------------------------------------------------------
diff --git a/external/wget-win.js b/external/wget-win.js
deleted file mode 100644
index 731d6d9..0000000
--- a/external/wget-win.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* wget-win.js UTF-8
- * Windows JScript for downloading from the URL in the first argument
- * to the file in the second argument.
- *
- * Adapted from wget.js at <http://superuser.com/a/536400/81303> created by
- * unregistered user190042 and last edited 2013-01-15T08:48.
- *
- * This script is designed to be used from the fetch_downloads.bat file
- * That should be nearby in the same directory.
- *
- * With Cscript wget-win.js url file
- *
- * url is the absolute URL of the file to download
- * file is the full-path file address to store the download at
- */
-
-var WinHttpReq = new ActiveXObject("WinHttp.WinHttpRequest.5.1");
-WinHttpReq.Open("GET", WScript.Arguments(0), /*async=*/false);
-WinHttpReq.Send();
-
-/* All files are downloaded as binary */
-BinStream = new ActiveXObject("ADODB.Stream");
-BinStream.Type = 1;
-BinStream.Open();
-BinStream.Write(WinHttpReq.ResponseBody);
-BinStream.SaveToFile(WScript.Arguments(1));
-
-/* *** end of wget-win.js *** */
-
-