Skip to content

Commit cf2725f

Browse files
lynnlangitlynnlangit
committed
Merge branch 'master' of git://github.com/jamesrcounts/TeachingKidsProgramming.Source.Java into jamesrcounts-master
Conflicts: build.xml build/properties/teaching_kids_programming.properties
2 parents ae8b36f + 516438f commit cf2725f

File tree

506 files changed

+3750
-3384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

506 files changed

+3750
-3384
lines changed

‎.classpath‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
16+
<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
517
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
6-
<classpathentry kind="lib" path="C:/Users/lynnlangit/Documents/GitHub/TKPSource/TeachingKidsProgramming.Source.Java/src/jars/commons-collections-3.1.jar"/>
7-
<classpathentry kind="lib" path="C:/Users/lynnlangit/Documents/GitHub/TKPSource/TeachingKidsProgramming.Source.Java/src/jars/log4j-1.2.9.jar"/>
8-
<classpathentry kind="lib" path="C:/Users/lynnlangit/Documents/GitHub/TKPSource/TeachingKidsProgramming.Source.Java/src/jars/servlet.jar"/>
9-
<classpathentry kind="lib" path="C:/Users/lynnlangit/Documents/GitHub/TKPSource/TeachingKidsProgramming.Source.Java/src/jars/velocity-1.4-p1.jar"/>
10-
<classpathentry kind="output" path="bin"/>
18+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
19+
<attributes>
20+
<attribute name="maven.pomderived" value="true"/>
21+
</attributes>
22+
</classpathentry>
23+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
24+
<attributes>
25+
<attribute name="maven.pomderived" value="true"/>
26+
</attributes>
27+
</classpathentry>
28+
<classpathentry kind="output" path="target/classes"/>
1129
</classpath>

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@
55

66
*.war
77
*.ear
8+
/target/
9+
10+
settings.xml
11+
/.idea
12+
TeachingKidsProgramming.Source.Java.iml
13+
14+
*.orig
15+
*.received.*

‎.project‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
1521
<nature>org.eclipse.jdt.core.javanature</nature>
1622
</natures>
1723
</projectDescription>

‎.settings/org.eclipse.core.resources.prefs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=ISO-8859-1
3+
encoding//src/main/resources=ISO-8859-1
4+
encoding//src/test/java=ISO-8859-1
5+
encoding//src/test/resources=ISO-8859-1
6+
encoding/<project>=ISO-8859-1

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 285 additions & 8 deletions
Large diffs are not rendered by default.

‎.settings/org.eclipse.jdt.ui.prefs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
eclipse.preferences.version=1
2+
formatter_profile=_Spun
3+
formatter_settings_version=12

‎.settings/org.eclipse.m2e.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎TeachingKidsProgramming.iml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
11+
<excludeFolder url="file://$MODULE_DIR$/target" />
12+
</content>
13+
<orderEntry type="inheritedJdk" />
14+
<orderEntry type="sourceFolder" forTests="false" />
15+
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
16+
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
17+
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
18+
<orderEntry type="library" name="Maven: velocity:velocity:1.4" level="project" />
19+
<orderEntry type="library" scope="RUNTIME" name="Maven: velocity:velocity-dep:1.4" level="project" />
20+
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
21+
<orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
22+
</component>
23+
</module>

build/build.xml renamed to build.xml

Lines changed: 60 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,67 @@
1-
<project name="Teaching Kids Programming" basedir="." default="Publish TeachingKidsProgramming">
2-
<target name="compile" depends="cleanUp">
1+
<?xml version="1.0"?>
2+
<project name="Teaching Kids Programming" basedir="." default="Publish TeachingKidsProgramming" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
3+
4+
5+
<property name="home" value="." />
6+
<property name="src" value="${home}/src/main/java" />
7+
<property name="rsrc" value="${home}/src/main/resources" />
8+
<property name="build_home" value="/tmp/builds" />
9+
<property name="build" value="${build_home}/build" />
10+
<property name="targetJavaClass" value="org/teachingextensions/**,you/**" />
11+
<property name="jar" value="${build}/TeachingKidsProgramming.jar" />
12+
<property name="tkp_workspace" value="${home}/../TeachingKidsProgramming.Java" />
13+
<property name="tkp_project" value="${tkp_workspace}/TeachingKidsProgramming" />
14+
<property name="documentation" value="${home}/build/resources/teaching_kids_programming" />
15+
<property name="excludeTests" value="true" />
16+
17+
<!-- maven integration -->
18+
<path id="maven-ant-tasks.classpath" path="build/maven-ant-tasks-2.1.3.jar" />
19+
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
20+
<artifact:pom id="tkppom" file="pom.xml" />
21+
<artifact:dependencies filesetId="pomdeps" pomRefId="tkppom" pathId="dependency.classpath" />
22+
23+
<target name="cleanTeachingKidsProgramming" description="Delete generated files from Eclipse project.">
24+
<delete dir="${tkp_project}/bin" failonerror="false" />
25+
<delete dir="${tkp_project}/src" failonerror="false" />
26+
<delete dir="${tkp_project}/build" failonerror="false" />
27+
</target>
28+
29+
<target name="cleanUp" description="Delete files from temp build directory.">
30+
<delete dir="${build}" />
31+
</target>
32+
33+
<target name="compile" depends="cleanUp" description="Compile sources.">
334
<mkdir dir="${build}" />
4-
<delete dir="${build}/com/spun" />
535
<echo>${targetJavaClass}</echo>
6-
<javac srcdir="${src}" destdir="${build}" debug="true" includes="${targetJavaClass}" target="1.7" source="1.7" listfiles="true">
36+
<javac includeantruntime="false" srcdir="${src}" destdir="${build}" debug="true" includes="${targetJavaClass}" target="1.7" source="1.7" listfiles="true">
737
<exclude name="**/tests/**" if="excludeTests" />
8-
9-
<classpath>
10-
<fileset dir="${src}/jars">
11-
<include name="**/*.jar" />
12-
</fileset>
13-
</classpath>
38+
<classpath refid="dependency.classpath" />
1439
</javac>
1540
</target>
16-
<target name="cleanUp">
17-
<delete dir="${build}" />
18-
</target>
1941

20-
<target name="buildJarFile" depends="compile">
42+
<target name="stagesrc" description="Copy source files to temp build directory.">
2143
<mkdir dir="${build}/src" />
2244
<copy todir="${build}/src">
2345
<fileset dir="${src}" includes="${targetJavaClass}/*.java">
2446
<exclude name="**/tests/**" if="excludeTests" />
2547
</fileset>
2648
</copy>
2749
<copy todir="${build}">
28-
<fileset dir="${src}" includes="${targetJavaClass}/*.png" />
50+
<fileset dir="${rsrc}" includes="*.png" />
2951
</copy>
52+
<copy todir="${build}/src/org/teachingextensions/logo">
53+
<fileset dir="${rsrc}" includes="*.png" />
54+
</copy>
55+
</target>
56+
57+
<target name="buildJarFile" depends="compile, stagesrc" description="Create jar file.">
3058
<delete file="${jar}" failonerror="false" />
3159
<jar destfile="${jar}" update="false">
3260
<fileset dir="${build}" includes="**" />
33-
3461
</jar>
3562
</target>
36-
<target name="createDownload" depends="buildJarFile">
37-
<zip destfile="${zip}" basedir="${build}" includes="*.jar,*.txt">
38-
<fileset dir="${documentation}" includes="**" />
39-
</zip>
40-
</target>
4163

42-
43-
<target name="Publish TeachingKidsProgramming">
44-
<property file="properties/teaching_kids_programming.properties" />
45-
<antcall target="createTeachingKidsProgramming" />
46-
</target>
47-
48-
<target name="cleanTeachingKidsProgramming">
49-
<delete dir="${tkp_project}/bin" failonerror="false" />
50-
<delete dir="${tkp_project}/src" failonerror="false" />
51-
<delete dir="${tkp_project}/build" failonerror="false" />
52-
</target>
53-
54-
<target name="createTeachingKidsProgramming" depends="cleanTeachingKidsProgramming, buildJarFile">
64+
<target name="createTeachingKidsProgramming" depends="cleanTeachingKidsProgramming, buildJarFile" description="Copy build files to Eclipse project.">
5565
<copy file="${build}/TeachingKidsProgramming.jar" todir="${tkp_project}/src/jars" />
5666
<copy file="${documentation}/build.xml" todir="${tkp_project}/build" />
5767
<copy todir="${tkp_project}/src" verbose="true">
@@ -67,11 +77,26 @@
6777
<zip destfile="${build}/tkp_workspace.v${version}.zip" basedir="${tkp_workspace}" includes="**">
6878
</zip>
6979
</target>
80+
81+
<target name="Publish TeachingKidsProgramming" description="Publish Eclipse Project">
82+
<property file="properties/teaching_kids_programming.properties" />
83+
<antcall target="createTeachingKidsProgramming" />
84+
</target>
85+
86+
87+
<!-- Other targets -->
88+
<target name="createDownload" depends="buildJarFile">
89+
<zip destfile="${zip}" basedir="${build}" includes="*.jar,*.txt">
90+
<fileset dir="${documentation}" includes="**" />
91+
</zip>
92+
</target>
93+
7094
<target name="Publish TKP Launcher">
7195
<property file="properties/tkplauncher.properties" />
7296
<antcall target="buildExecutableTkpJarFile" />
7397

7498
</target>
99+
75100
<target name="buildExecutableTkpJarFile" depends="compile">
76101
<jar destfile="${jar}/TKP_Launcher.jar" update="false">
77102
<fileset dir="${build}" includes="**" />
@@ -80,6 +105,7 @@
80105
</manifest>
81106
</jar>
82107
</target>
108+
83109
<target name="Publish TKP ThumbDriveInstaller">
84110
<property file="properties/tkplauncher.properties" />
85111
<antcall target="buildThumbDriveInstaller" />

‎build/maven-ant-tasks-2.1.3.jar‎

1.26 MB
Binary file not shown.

0 commit comments

Comments
 (0)