From: Marco Zanon <info@marcozanon.com>
Date: Thu, 13 Dec 2018 14:15:18 +0000 (+0000)
Subject: Restructured the directory tree and build file.
X-Git-Tag: SVN-to-Git~49
X-Git-Url: https://gitweb.marcozanon.com/?a=commitdiff_plain;h=22473c01aed4ee14633d269202a0451de8039ad3;p=Macaco

Restructured the directory tree and build file.
---

diff --git a/6.x/LICENSE b/6.x/LICENSE
deleted file mode 100644
index 40635ba..0000000
--- a/6.x/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Macaco
-Copyright (c) 2009-2017 Marco Zanon <info@marcozanon.com>.
-
-Released under MIT license (see LICENSE.MIT.sample for details).
-
-Small portions inspired by other projects or web pages.
-See source code for additional information.
diff --git a/6.x/LICENSE.MIT.sample b/6.x/LICENSE.MIT.sample
deleted file mode 100644
index 8aa2645..0000000
--- a/6.x/LICENSE.MIT.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) [year] [fullname]
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/6.x/LICENSES/LICENSE b/6.x/LICENSES/LICENSE
new file mode 100644
index 0000000..40635ba
--- /dev/null
+++ b/6.x/LICENSES/LICENSE
@@ -0,0 +1,7 @@
+Macaco
+Copyright (c) 2009-2017 Marco Zanon <info@marcozanon.com>.
+
+Released under MIT license (see LICENSE.MIT.sample for details).
+
+Small portions inspired by other projects or web pages.
+See source code for additional information.
diff --git a/6.x/LICENSES/LICENSE.MIT.sample b/6.x/LICENSES/LICENSE.MIT.sample
new file mode 100644
index 0000000..8aa2645
--- /dev/null
+++ b/6.x/LICENSES/LICENSE.MIT.sample
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) [year] [fullname]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/6.x/build.xml b/6.x/build.xml
index ac856e1..97b64b0 100644
--- a/6.x/build.xml
+++ b/6.x/build.xml
@@ -12,6 +12,7 @@
 
     <target name="clean" description="Cleans up everything.">
         <delete dir="target/" />
+        <delete dir="build/" />
     </target>
 
     <target name="createArchive" depends="clean" description="Packs source files into a .tar.gz archive.">
@@ -19,15 +20,15 @@
     </target>
 
     <target name="compile" depends="clean" description="Compiles .java source code to .class bytecode.">
-        <mkdir dir="target/classes/" />
-        <javac target="1.8" source="1.8" srcdir="src/java/" destdir="target/classes/">
+        <mkdir dir="build/classes/" />
+        <javac target="1.8" source="1.8" srcdir="src/java/" destdir="build/classes/">
             <compilerarg value="-Xlint:none" />
         </javac>
     </target>
 
     <target name="createJarFile" depends="compile" description="Creates a .jar file.">
         <jar destfile="target/${ant.project.name}.jar">
-            <fileset dir="target/classes/" includes="**/*.class" />
+            <fileset dir="build/classes/" includes="**/*.class" />
         </jar>
     </target>