Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'JMRI/master'
- Loading branch information
Showing
1,141 changed files
with
113,618 additions
and
112,962 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| # Common Git rules for JMRI/website repository | ||
| # | ||
| # See also the JMRI/JMRI repository file of the same name | ||
| # | ||
| # Initially from https://github.com/Danimoth/gitattributes/blob/master/Java.gitattributes | ||
| # see also http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/ | ||
|
|
||
| # Handle line endings automatically for files detected as text | ||
| # and leave all files detected as binary untouched. | ||
| * text=auto | ||
|
|
||
| # | ||
| # The above will handle all files NOT found below | ||
| # | ||
| # These files are text and should be normalized (Convert crlf => lf) | ||
| # This list should be kept consistent with the one in the build.xml ant "fixlineends" target | ||
| # | ||
| *.csh text | ||
| *.css text | ||
| *.df text | ||
| *.dtd text | ||
| *.htm text | ||
| *.html text | ||
| *.java text | ||
| *.js text | ||
| *.json text | ||
| *.jsp text | ||
| *.jspf text | ||
| *.lcf text | ||
| *.md text | ||
| *.php text | ||
| *.pl text | ||
| *.plist text | ||
| *.policy text | ||
| *.prefs text | ||
| *.properties text | ||
| *.project text | ||
| *.py text | ||
| *.sh text | ||
| *.shtml text | ||
| *.svg text | ||
| *.tld text | ||
| *.txt text | ||
| *.xml text | ||
| *.xsd text | ||
| *.xsl text | ||
| COPYING text | ||
| Footer text | ||
| README text | ||
| Header text | ||
| Sidebar text | ||
| TODO text | ||
|
|
||
| # These files are binary and should be left untouched | ||
| # (binary is a macro for -text -diff) | ||
| *.app binary | ||
| *.class binary | ||
| *.dll binary | ||
| *.dylib binary | ||
| *.ear binary | ||
| *.gif binary | ||
| *.GIF binary | ||
| *.ico binary | ||
| *.jar binary | ||
| *.jnilib binary | ||
| *.jpg binary | ||
| *.jpeg binary | ||
| *.pdf binary | ||
| *.png binary | ||
| *.so binary | ||
| *.vsd binary | ||
| *.war binary | ||
| *.wav binary | ||
| *.zip binary |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| language: java | ||
|
|
||
| script: travis_wait ant checklineends | ||
|
|
||
| os: | ||
| - linux | ||
| # - osx # Travis OS X support does not include Java |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # JMRI | ||
|
|
||
| Model railroad software | ||
|
|
||
| For more information, see [JMRI.org](http://jmri.org) | ||
|
|
||
| For development information, see [Technical Info](http://jmri.org/help/en/html/doc/Technical) | ||
|
|
||
| User discussions are on the [JMRIusers Yahoo group](https://groups.yahoo.com/neo/groups/jmriusers/info) | ||
|
|
||
| [](https://travis-ci.org/JMRI/JMRI) | ||
| [](https://ci.appveyor.com/project/JMRI/jmri/branch/master) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- Ant build.xml file for JMRI development --> | ||
| <!-- Bob Jacobsen, Copyright 2002-2016 --> | ||
|
|
||
| <!-- This file is part of JMRI. --> | ||
| <!-- --> | ||
| <!-- JMRI is free software; you can redistribute it and/or modify it under --> | ||
| <!-- the terms of version 2 of the GNU General Public License as published --> | ||
| <!-- by the Free Software Foundation. See the "COPYING" file for a copy --> | ||
| <!-- of this license. --> | ||
| <!-- --> | ||
| <!-- JMRI is distributed in the hope that it will be useful, but WITHOUT --> | ||
| <!-- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --> | ||
| <!-- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --> | ||
| <!-- for more details. --> | ||
|
|
||
| <project name="JMRI/website" default="" basedir="."> | ||
|
|
||
| <!-- basedir="." means all paths are relative to the top level --> | ||
| <!-- directory in the project. --> | ||
|
|
||
| <description> | ||
| Provides build services for JMRI website | ||
| </description> | ||
|
|
||
| <property name="jmri.copyright.year" value="1997-2016"/> | ||
|
|
||
| <!-- check for bad line ends, e.g. not ready to go into Git --> | ||
| <!-- May not (probably will not) work on Windows --> | ||
|
|
||
| <target name="checklineends" description="mark files with CRLF line ends"> | ||
| <exec executable="sh" outputproperty="checklineeds.files"> | ||
| <arg value="-c" /> | ||
| <arg value="find . -not -type d -exec file '{}' ';' | grep CRLF" /> | ||
| </exec> | ||
|
|
||
| <fail message="${checklineeds.files}"> | ||
| <condition> | ||
| <length string="${checklineeds.files}" when="greater" length="0" /> | ||
| </condition> | ||
| </fail> | ||
| </target> | ||
|
|
||
| <!-- end of file-checking targets --> | ||
|
|
||
| <target name="fixlineends" description="convert specific files to LF line ends"> | ||
| <fixcrlf eol="unix" srcdir="." includes=" | ||
| **/*.csh | ||
| **/*.css | ||
| **/*.df | ||
| **/*.dtd | ||
| **/*htm | ||
| **/*html | ||
| **/*.java | ||
| **/*.js | ||
| **/*.json | ||
| **/*.jsp | ||
| **/*.jspf | ||
| **/*.lcf | ||
| **/*.md | ||
| **/*.php | ||
| **/*.pl | ||
| **/*.plist | ||
| **/*.policy | ||
| **/*.prefs | ||
| **/*.properties | ||
| **/*.project | ||
| **/*.py | ||
| **/*.sh | ||
| **/*.svg | ||
| **/*.tld | ||
| **/*.txt | ||
| **/*.xml | ||
| **/*.xsd | ||
| **/*.xsl | ||
| **/COPYING | ||
| **/Footer | ||
| **/Header | ||
| **/README* | ||
| **/Sidebar | ||
| **/TODO | ||
| " /> | ||
| </target> | ||
|
|
||
| <!-- end of file-checking targets --> | ||
|
|
||
| </project> |
Oops, something went wrong.