Skip to content

Commit

Permalink
Update all CRLF line endings to LF
Browse files Browse the repository at this point in the history 
All line endings in a git project should be Unix style:
   Line Feed (LF), also known as \n

Windows style line endings are not allowed:
   Carrige Return + Line Feed (CRLF), also known as \r\n

For more information on how to automatically handle this, see:
  http://help.github.com/line-endings/
  • Loading branch information
@danielduner
danielduner committed Mar 4, 2012
1 parent faa477f commit 4fcad75
Show file tree
Hide file tree
Showing 48 changed files with 3,951 additions and 3,951 deletions.
24 changes: 12 additions & 12 deletions .gitignore
View file
@@ -1,12 +1,12 @@
bin/
.gradle
build
/nbproject/private/
*~
.DS_Store
/dist/
.settings
*.class
*.sw?
lib/.tmp/
doc/
bin/
.gradle
build
/nbproject/private/
*~
.DS_Store
/dist/
.settings
*.class
*.sw?
lib/.tmp/
doc/
34 changes: 17 additions & 17 deletions LICENSE
View file
@@ -1,18 +1,18 @@
Copyright (c) 2012 Mojang AB
Copyright (c) 2012 Maescool and all other contributors
Visit https://github.com/Maescool/Catacomb-Snatch/contributors
for the complete list of contributors.
The original resources of the game are, and remain the property of
Mojang AB. Given the lack of information provided by Mojang AB
regarding the licensing of these resources, any use, dissemination
or reproduction of them is done without any warranty regarding their
legality.
All changes made to the original resources of the game are licensed
under the Creative Commons Attribution-NonCommercial-ShareAlike
3.0 Unported License. To view a copy of this license, visit
http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter to
Creative Commons, 444 Castro Street, Suite 900, Mountain View,
Copyright (c) 2012 Mojang AB
Copyright (c) 2012 Maescool and all other contributors

Visit https://github.com/Maescool/Catacomb-Snatch/contributors
for the complete list of contributors.

The original resources of the game are, and remain the property of
Mojang AB. Given the lack of information provided by Mojang AB
regarding the licensing of these resources, any use, dissemination
or reproduction of them is done without any warranty regarding their
legality.

All changes made to the original resources of the game are licensed
under the Creative Commons Attribution-NonCommercial-ShareAlike
3.0 Unported License. To view a copy of this license, visit
http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter to
Creative Commons, 444 Castro Street, Suite 900, Mountain View,
California, 94041, USA.
174 changes: 87 additions & 87 deletions build.xml
View file
@@ -1,87 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="Catacomb_Snatch" default="default" basedir=".">
<description>Builds, tests, and runs the project Catacomb Snatch.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar-with-manifest: JAR building (if you are using a manifest)
-do-jar-without-manifest: JAR building (if you are not using a manifest)
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="Catacomb_Snatch-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->

<target name="-post-jar">
<jar jarfile="${dist.dir}/Catacomb_Snatch_combined.jar">
<zipfileset src="${dist.jar}" excludes="META-INF/*" />
<zipfileset src="${file.reference.CodecJOrbis.jar}" excludes="META-INF/*" />
<zipfileset src="${file.reference.CodecWav.jar}" excludes="META-INF/*" />
<zipfileset src="${file.reference.LibraryJavaSound.jar}" excludes="META-INF/*" />
<zipfileset src="${file.reference.SoundSystem.jar}" excludes="META-INF/*" />
<manifest>
<attribute name="Main-Class" value="${main.class}" />
</manifest>
</jar>
</target>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="Catacomb_Snatch" default="default" basedir=".">
<description>Builds, tests, and runs the project Catacomb Snatch.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar-with-manifest: JAR building (if you are using a manifest)
-do-jar-without-manifest: JAR building (if you are not using a manifest)
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="Catacomb_Snatch-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->

<target name="-post-jar">
<jar jarfile="${dist.dir}/Catacomb_Snatch_combined.jar">
<zipfileset src="${dist.jar}" excludes="META-INF/*" />
<zipfileset src="${file.reference.CodecJOrbis.jar}" excludes="META-INF/*" />
<zipfileset src="${file.reference.CodecWav.jar}" excludes="META-INF/*" />
<zipfileset src="${file.reference.LibraryJavaSound.jar}" excludes="META-INF/*" />
<zipfileset src="${file.reference.SoundSystem.jar}" excludes="META-INF/*" />
<manifest>
<attribute name="Main-Class" value="${main.class}" />
</manifest>
</jar>
</target>
</project>
6 changes: 3 additions & 3 deletions manifest.mf
View file
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build

0 comments on commit 4fcad75

Please sign in to comment.