You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by or...@apache.org on 2015/08/09 18:25:59 UTC
[1/2] incubator-corinthia git commit: Expand .gitignore cases
Repository: incubator-corinthia
Updated Branches:
refs/heads/master f17a5c777 -> 75ef795dd
Expand .gitignore cases
Update to .gitignore to exclude places that are only populated by
editing and builds and never carried in the repository. Added more
comments to make the principle clear, with a little redundancy in the
case of Visual Studio artifacts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/002851b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/002851b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/002851b3
Branch: refs/heads/master
Commit: 002851b3695cf249162197a4fff2386b90c5d314
Parents: f17a5c7
Author: Dennis Hamilton <or...@apache.org>
Authored: Sun Aug 9 09:24:34 2015 -0700
Committer: Dennis Hamilton <or...@apache.org>
Committed: Sun Aug 9 09:24:34 2015 -0700
----------------------------------------------------------------------
.gitignore | 36 +++++++++++++++++++++++++++++++-----
1 file changed, 31 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/002851b3/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 700fbbf..8343cc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# .gitignore UTF-8 2015-05-17
+# .gitignore 0.05 UTF-8 2015-08-09
#
# CORINTHIA/ROOT
# ==============
@@ -10,14 +10,40 @@
# part of a structure where anyone can do multiple flavors of builds
# along-side the source without cluttering the repository iself.
+## ELIMINATE AUTHORING/FILE-SYSTEM ARTIFACTS
+## -----------------------------------------
-# Build results
-build*/
-
-# External downloads
+# Editing backup and working files
+*~
+*#
# Finder directory status files (OS X)
.DS_Store
+## ELIMINATION OF VISUAL STUDIO SOLUTIONS
+## --------------------------------------
+
+# Do not include working solutions in the repository tree. For Corinthia,
+# these will be built/extracted dynamically into the build/ folder as needed
+# and will not appear directly in the source tree.
+
+*.sln
+*.vcxproj
+*.vcxproj.filters
+
+## KEEP BUILDS IN THE BUILD/ FOLDER
+## --------------------------------
+external/*
+# Do not include any externals in the repository
+
+build*/
+# If all build operations are carried out in either the build/ folder or
+# outside of the repository folder, they will be automatically excluded from
+# the repository.
+
+# 0.05 2015-08-09 Add additional build exclusions based on the recommended
+# for GitHub and experience with ephemeral artifacts on Windows. Based
+# on an 0.04 from another project (orcmid).
+#
# *** end of .gitignore ***
Re: [2/2] incubator-corinthia git commit: Note on iconv dependencies
Posted by jan i <ja...@apache.org>.
I do not understand the purpose of this file ?
I do understand that you have been searching, which is good, but why add it
as a file to our repo ?
rgds
jan i.
On 9 August 2015 at 18:26, <or...@apache.org> wrote:
> Note on iconv dependencies
>
> Result of a grep search for iconv.h dependencies. (Included by mistake,
> but perhaps useful in review.)
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/75ef795d
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/75ef795d
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/75ef795d
>
> Branch: refs/heads/master
> Commit: 75ef795dd7cbe036f9eaf924cb72f513bf648cca
> Parents: 002851b
> Author: Dennis Hamilton <or...@apache.org>
> Authored: Sun Aug 9 09:25:46 2015 -0700
> Committer: Dennis Hamilton <or...@apache.org>
> Committed: Sun Aug 9 09:25:46 2015 -0700
>
> ----------------------------------------------------------------------
> iconv.txt | 29 +++++++++++++++++++++++++++++
> 1 file changed, 29 insertions(+)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/75ef795d/iconv.txt
> ----------------------------------------------------------------------
> diff --git a/iconv.txt b/iconv.txt
> new file mode 100644
> index 0000000..f3ec07e
> --- /dev/null
> +++ b/iconv.txt
> @@ -0,0 +1,29 @@
> +*** (orcmid). I did a grep to find all of the places that have an iconv.h
> +*** dependency. These are what I found. Note that inconv.h shows up as
> an
> +*** optional dependency of some externals and there are ways to exclude
> it.
> +
> +./DocFormats/platform/3rdparty/w3c-tidy-html5/src/iconvtc.c:#include
> <iconv.h>
> +
> +Binary file ./external/download/iconv-1.9.2.win32.zip matches
> +
> +./external/download/include/iconv.h:/* When installed, this file is called
> + "iconv.h". */
> +
> +./external/download/include/iconv.h: errors because some other system
> header
> + file includes /usr/include/iconv.h
> +
> +./external/download/include/iconv.h: But gcc's #include_next is not
> + portable. Thus, once libiconv's iconv.h
> +
> +./external/download/include/iconv.h: include the original
> + /usr/include/iconv.h. We simply have to get away
> +
> +./external/download/include/iconv.h: #include "iconv.h" or
> #include_next
> + "iconv.h"
> +
> +./external/download/include/iconv.h: is small. They all do #include
> + <iconv.h>.
> +
> +./external/download/include/libxml/encoding.h:#include <iconv.h>
> +
> +./external/download/include/SDL_stdinc.h:# include <iconv.h>
>
>
Re: [2/2] incubator-corinthia git commit: Note on iconv dependencies
Posted by jan i <ja...@apache.org>.
I do not understand the purpose of this file ?
I do understand that you have been searching, which is good, but why add it
as a file to our repo ?
rgds
jan i.
On 9 August 2015 at 18:26, <or...@apache.org> wrote:
> Note on iconv dependencies
>
> Result of a grep search for iconv.h dependencies. (Included by mistake,
> but perhaps useful in review.)
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/75ef795d
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/75ef795d
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/75ef795d
>
> Branch: refs/heads/master
> Commit: 75ef795dd7cbe036f9eaf924cb72f513bf648cca
> Parents: 002851b
> Author: Dennis Hamilton <or...@apache.org>
> Authored: Sun Aug 9 09:25:46 2015 -0700
> Committer: Dennis Hamilton <or...@apache.org>
> Committed: Sun Aug 9 09:25:46 2015 -0700
>
> ----------------------------------------------------------------------
> iconv.txt | 29 +++++++++++++++++++++++++++++
> 1 file changed, 29 insertions(+)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/75ef795d/iconv.txt
> ----------------------------------------------------------------------
> diff --git a/iconv.txt b/iconv.txt
> new file mode 100644
> index 0000000..f3ec07e
> --- /dev/null
> +++ b/iconv.txt
> @@ -0,0 +1,29 @@
> +*** (orcmid). I did a grep to find all of the places that have an iconv.h
> +*** dependency. These are what I found. Note that inconv.h shows up as
> an
> +*** optional dependency of some externals and there are ways to exclude
> it.
> +
> +./DocFormats/platform/3rdparty/w3c-tidy-html5/src/iconvtc.c:#include
> <iconv.h>
> +
> +Binary file ./external/download/iconv-1.9.2.win32.zip matches
> +
> +./external/download/include/iconv.h:/* When installed, this file is called
> + "iconv.h". */
> +
> +./external/download/include/iconv.h: errors because some other system
> header
> + file includes /usr/include/iconv.h
> +
> +./external/download/include/iconv.h: But gcc's #include_next is not
> + portable. Thus, once libiconv's iconv.h
> +
> +./external/download/include/iconv.h: include the original
> + /usr/include/iconv.h. We simply have to get away
> +
> +./external/download/include/iconv.h: #include "iconv.h" or
> #include_next
> + "iconv.h"
> +
> +./external/download/include/iconv.h: is small. They all do #include
> + <iconv.h>.
> +
> +./external/download/include/libxml/encoding.h:#include <iconv.h>
> +
> +./external/download/include/SDL_stdinc.h:# include <iconv.h>
>
>
[2/2] incubator-corinthia git commit: Note on iconv dependencies
Posted by or...@apache.org.
Note on iconv dependencies
Result of a grep search for iconv.h dependencies. (Included by mistake,
but perhaps useful in review.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/75ef795d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/75ef795d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/75ef795d
Branch: refs/heads/master
Commit: 75ef795dd7cbe036f9eaf924cb72f513bf648cca
Parents: 002851b
Author: Dennis Hamilton <or...@apache.org>
Authored: Sun Aug 9 09:25:46 2015 -0700
Committer: Dennis Hamilton <or...@apache.org>
Committed: Sun Aug 9 09:25:46 2015 -0700
----------------------------------------------------------------------
iconv.txt | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/75ef795d/iconv.txt
----------------------------------------------------------------------
diff --git a/iconv.txt b/iconv.txt
new file mode 100644
index 0000000..f3ec07e
--- /dev/null
+++ b/iconv.txt
@@ -0,0 +1,29 @@
+*** (orcmid). I did a grep to find all of the places that have an iconv.h
+*** dependency. These are what I found. Note that inconv.h shows up as an
+*** optional dependency of some externals and there are ways to exclude it.
+
+./DocFormats/platform/3rdparty/w3c-tidy-html5/src/iconvtc.c:#include <iconv.h>
+
+Binary file ./external/download/iconv-1.9.2.win32.zip matches
+
+./external/download/include/iconv.h:/* When installed, this file is called
+ "iconv.h". */
+
+./external/download/include/iconv.h: errors because some other system header
+ file includes /usr/include/iconv.h
+
+./external/download/include/iconv.h: But gcc's #include_next is not
+ portable. Thus, once libiconv's iconv.h
+
+./external/download/include/iconv.h: include the original
+ /usr/include/iconv.h. We simply have to get away
+
+./external/download/include/iconv.h: #include "iconv.h" or #include_next
+ "iconv.h"
+
+./external/download/include/iconv.h: is small. They all do #include
+ <iconv.h>.
+
+./external/download/include/libxml/encoding.h:#include <iconv.h>
+
+./external/download/include/SDL_stdinc.h:# include <iconv.h>
Fwd: [1/2] incubator-corinthia git commit: Expand .gitignore cases
Posted by jan i <ja...@apache.org>.
Just forwarding to dev@, as you noted some time ago, we should not discuss
on commits@
rgds
jan i
---------- Forwarded message ----------
From: jan i <ja...@apache.org>
Date: 9 August 2015 at 18:30
Subject: Re: [1/2] incubator-corinthia git commit: Expand .gitignore cases
To: "dev@corinthia.incubator.apache.org" <dev@corinthia.incubator.apache.org
>
Cc: commits@corinthia.incubator.apache.org
Specific comments below:
On 9 August 2015 at 18:25, <or...@apache.org> wrote:
> Repository: incubator-corinthia
> Updated Branches:
> refs/heads/master f17a5c777 -> 75ef795dd
>
>
> Expand .gitignore cases
>
> Update to .gitignore to exclude places that are only populated by
> editing and builds and never carried in the repository. Added more
> comments to make the principle clear, with a little redundancy in the
> case of Visual Studio artifacts.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/002851b3
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/002851b3
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/002851b3
>
> Branch: refs/heads/master
> Commit: 002851b3695cf249162197a4fff2386b90c5d314
> Parents: f17a5c7
> Author: Dennis Hamilton <or...@apache.org>
> Authored: Sun Aug 9 09:24:34 2015 -0700
> Committer: Dennis Hamilton <or...@apache.org>
> Committed: Sun Aug 9 09:24:34 2015 -0700
>
> ----------------------------------------------------------------------
> .gitignore | 36 +++++++++++++++++++++++++++++++-----
> 1 file changed, 31 insertions(+), 5 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/002851b3/.gitignore
> ----------------------------------------------------------------------
> diff --git a/.gitignore b/.gitignore
> index 700fbbf..8343cc6 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,4 +1,4 @@
> -# .gitignore UTF-8
> 2015-05-17
> +# .gitignore 0.05 UTF-8
> 2015-08-09
> #
> # CORINTHIA/ROOT
> # ==============
> @@ -10,14 +10,40 @@
> # part of a structure where anyone can do multiple flavors of builds
> # along-side the source without cluttering the repository iself.
>
> +## ELIMINATE AUTHORING/FILE-SYSTEM ARTIFACTS
> +## -----------------------------------------
>
> -# Build results
> -build*/
> -
> -# External downloads
> +# Editing backup and working files
> +*~
> +*#
>
> # Finder directory status files (OS X)
> .DS_Store
>
> +## ELIMINATION OF VISUAL STUDIO SOLUTIONS
> +## --------------------------------------
> +
> +# Do not include working solutions in the repository tree. For Corinthia,
> +# these will be built/extracted dynamically into the build/ folder as
> needed
> +# and will not appear directly in the source tree.
> +
> +*.sln
> +*.vcxproj
> +*.vcxproj.filters
>
These are in the build directory, if you find then anywhere else it is a
problem you should be aware of and remove. When you add them to .gitignore
people
do not see the problem.
> +
> +## KEEP BUILDS IN THE BUILD/ FOLDER
> +## --------------------------------
>
> +external/*
> +# Do not include any externals in the repository
>
This directory do not exist, why exclude that, then you should exclude all
directories (apart from those in the repo).
> +
> +build*/
> +# If all build operations are carried out in either the build/ folder or
> +# outside of the repository folder, they will be automatically excluded
> from
> +# the repository.
> +
> +# 0.05 2015-08-09 Add additional build exclusions based on the recommended
> +# for GitHub and experience with ephemeral artifacts on Windows.
> Based
> +# on an 0.04 from another project (orcmid).
> +#
> # *** end of .gitignore ***
>
>
I ask you to at least make the corrections stated above.
rgds
jan i.
Re: [1/2] incubator-corinthia git commit: Expand .gitignore cases
Posted by jan i <ja...@apache.org>.
Specific comments below:
On 9 August 2015 at 18:25, <or...@apache.org> wrote:
> Repository: incubator-corinthia
> Updated Branches:
> refs/heads/master f17a5c777 -> 75ef795dd
>
>
> Expand .gitignore cases
>
> Update to .gitignore to exclude places that are only populated by
> editing and builds and never carried in the repository. Added more
> comments to make the principle clear, with a little redundancy in the
> case of Visual Studio artifacts.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/002851b3
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/002851b3
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/002851b3
>
> Branch: refs/heads/master
> Commit: 002851b3695cf249162197a4fff2386b90c5d314
> Parents: f17a5c7
> Author: Dennis Hamilton <or...@apache.org>
> Authored: Sun Aug 9 09:24:34 2015 -0700
> Committer: Dennis Hamilton <or...@apache.org>
> Committed: Sun Aug 9 09:24:34 2015 -0700
>
> ----------------------------------------------------------------------
> .gitignore | 36 +++++++++++++++++++++++++++++++-----
> 1 file changed, 31 insertions(+), 5 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/002851b3/.gitignore
> ----------------------------------------------------------------------
> diff --git a/.gitignore b/.gitignore
> index 700fbbf..8343cc6 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,4 +1,4 @@
> -# .gitignore UTF-8
> 2015-05-17
> +# .gitignore 0.05 UTF-8
> 2015-08-09
> #
> # CORINTHIA/ROOT
> # ==============
> @@ -10,14 +10,40 @@
> # part of a structure where anyone can do multiple flavors of builds
> # along-side the source without cluttering the repository iself.
>
> +## ELIMINATE AUTHORING/FILE-SYSTEM ARTIFACTS
> +## -----------------------------------------
>
> -# Build results
> -build*/
> -
> -# External downloads
> +# Editing backup and working files
> +*~
> +*#
>
> # Finder directory status files (OS X)
> .DS_Store
>
> +## ELIMINATION OF VISUAL STUDIO SOLUTIONS
> +## --------------------------------------
> +
> +# Do not include working solutions in the repository tree. For Corinthia,
> +# these will be built/extracted dynamically into the build/ folder as
> needed
> +# and will not appear directly in the source tree.
> +
> +*.sln
> +*.vcxproj
> +*.vcxproj.filters
>
These are in the build directory, if you find then anywhere else it is a
problem you should be aware of and remove. When you add them to .gitignore
people
do not see the problem.
> +
> +## KEEP BUILDS IN THE BUILD/ FOLDER
> +## --------------------------------
>
> +external/*
> +# Do not include any externals in the repository
>
This directory do not exist, why exclude that, then you should exclude all
directories (apart from those in the repo).
> +
> +build*/
> +# If all build operations are carried out in either the build/ folder or
> +# outside of the repository folder, they will be automatically excluded
> from
> +# the repository.
> +
> +# 0.05 2015-08-09 Add additional build exclusions based on the recommended
> +# for GitHub and experience with ephemeral artifacts on Windows.
> Based
> +# on an 0.04 from another project (orcmid).
> +#
> # *** end of .gitignore ***
>
>
I ask you to at least make the corrections stated above.
rgds
jan i.
Re: [1/2] incubator-corinthia git commit: Expand .gitignore cases
Posted by jan i <ja...@apache.org>.
Specific comments below:
On 9 August 2015 at 18:25, <or...@apache.org> wrote:
> Repository: incubator-corinthia
> Updated Branches:
> refs/heads/master f17a5c777 -> 75ef795dd
>
>
> Expand .gitignore cases
>
> Update to .gitignore to exclude places that are only populated by
> editing and builds and never carried in the repository. Added more
> comments to make the principle clear, with a little redundancy in the
> case of Visual Studio artifacts.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/002851b3
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/002851b3
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/002851b3
>
> Branch: refs/heads/master
> Commit: 002851b3695cf249162197a4fff2386b90c5d314
> Parents: f17a5c7
> Author: Dennis Hamilton <or...@apache.org>
> Authored: Sun Aug 9 09:24:34 2015 -0700
> Committer: Dennis Hamilton <or...@apache.org>
> Committed: Sun Aug 9 09:24:34 2015 -0700
>
> ----------------------------------------------------------------------
> .gitignore | 36 +++++++++++++++++++++++++++++++-----
> 1 file changed, 31 insertions(+), 5 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/002851b3/.gitignore
> ----------------------------------------------------------------------
> diff --git a/.gitignore b/.gitignore
> index 700fbbf..8343cc6 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,4 +1,4 @@
> -# .gitignore UTF-8
> 2015-05-17
> +# .gitignore 0.05 UTF-8
> 2015-08-09
> #
> # CORINTHIA/ROOT
> # ==============
> @@ -10,14 +10,40 @@
> # part of a structure where anyone can do multiple flavors of builds
> # along-side the source without cluttering the repository iself.
>
> +## ELIMINATE AUTHORING/FILE-SYSTEM ARTIFACTS
> +## -----------------------------------------
>
> -# Build results
> -build*/
> -
> -# External downloads
> +# Editing backup and working files
> +*~
> +*#
>
> # Finder directory status files (OS X)
> .DS_Store
>
> +## ELIMINATION OF VISUAL STUDIO SOLUTIONS
> +## --------------------------------------
> +
> +# Do not include working solutions in the repository tree. For Corinthia,
> +# these will be built/extracted dynamically into the build/ folder as
> needed
> +# and will not appear directly in the source tree.
> +
> +*.sln
> +*.vcxproj
> +*.vcxproj.filters
>
These are in the build directory, if you find then anywhere else it is a
problem you should be aware of and remove. When you add them to .gitignore
people
do not see the problem.
> +
> +## KEEP BUILDS IN THE BUILD/ FOLDER
> +## --------------------------------
>
> +external/*
> +# Do not include any externals in the repository
>
This directory do not exist, why exclude that, then you should exclude all
directories (apart from those in the repo).
> +
> +build*/
> +# If all build operations are carried out in either the build/ folder or
> +# outside of the repository folder, they will be automatically excluded
> from
> +# the repository.
> +
> +# 0.05 2015-08-09 Add additional build exclusions based on the recommended
> +# for GitHub and experience with ephemeral artifacts on Windows.
> Based
> +# on an 0.04 from another project (orcmid).
> +#
> # *** end of .gitignore ***
>
>
I ask you to at least make the corrections stated above.
rgds
jan i.