Changeset 25370 in osm

Timestamp:

2011-02-19T17:07:05+01:00 (16 years ago)

Author:

stotz

Message:

Gpl added; release zip created

Location:

applications/viewer/jmapviewer

Files:

• . (modified) (1 prop)
• .settings/org.eclipse.jdt.core.prefs (modified) (3 diffs)
• .settings/org.eclipse.jdt.ui.prefs (modified) (1 diff)
• Gpl.txt (added)
• Readme.txt (modified) (2 diffs)
• build.xml (modified) (4 diffs)
• releases (added)
• releases/2011-02-19 (added)
• releases/2011-02-19/JMapViewer.zip (added)

applications/viewer/jmapviewer

@@ -4 +4 @@
 bin
 tiles
+JMapViewer.zip

@@ -4 +4 @@
 bin
 tiles
+JMapViewer.zip

applications/viewer/jmapviewer/.settings/org.eclipse.jdt.core.prefs

@@ -1 @@
-#Tue Oct 21 16:34:49 CEST 2008
+#Sun Jan 31 13:16:40 CET 2010
 eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
@@ -7 +27 @@
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=16
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
@@ -243 +263 @@
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

applications/viewer/jmapviewer/.settings/org.eclipse.jdt.ui.prefs

@@ -1 @@
-#Tue Oct 21 16:34:49 CEST 2008
+#Sun Jan 31 13:16:40 CET 2010
 eclipse.preferences.version=1
 formatter_profile=_JOSM
 formatter_settings_version=11
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true

applications/viewer/jmapviewer/Readme.txt

@@ -1 +1 @@
 JMapViewer
 
-(c) 2008 Jan Peter Stotz
+(c) 2008 Jan Peter Stotz and others
 
 This work bases partly on the JOSM plugin "Slippy Map Chooser" by Tim Haussmann
@@ -18 +18 @@
 
 JMapViewer loads bitmap tiles from the OpenStreetmap tile server (Mapnik renderer).
-Therefore any application using JMapViewer requires a working internet connection.    
+Therefore any application using JMapViewer requires a working Internet connection.    
 
 3. How do I use JMapViewer in my application?

applications/viewer/jmapviewer/build.xml

@@ -2 +2 @@
 <project default="all" name="Compile and build java classes plus jar archives">
 
-        <target name="all" depends="clean,build,pack,create_run_jar" />
+        <target name="all" depends="clean,build,pack,create_run_jar,create_release_zip" />
 
         <target name="clean">
@@ -14 +14 @@
         <target name="build">
                 <javac srcdir="src" destdir="bin" target="1.5" debug="true">
-                        <include name="org/openstreetmap/gui/jmapviewer/**"/>
+                        <include name="org/openstreetmap/gui/jmapviewer/**" />
                 </javac>
 
@@ -27 +27 @@
                 <delete file="JMapViewer.jar" />
                 <delete file="JMapViewer_src.jar" />
+                <!-- Create the JAR file containing the compiled class files -->
                 <jar destfile="JMapViewer.jar" filesetmanifest="mergewithoutmain">
-                        <fileset dir="bin" includes="**/jmapviewer/**">
-                        </fileset>
-                        <fileset dir="src" includes="**/jmapviewer/**" />
+                        <fileset dir="bin" includes="**/jmapviewer/**" />
                 </jar>
+                <!-- Create the JAR file containing the source java files -->
                 <jar destfile="JMapViewer_src.jar" filesetmanifest="mergewithoutmain">
                         <fileset dir="src" includes="**/jmapviewer/**" />
@@ -37 +37 @@
         </target>
 
-        <target name="create_run_jar">
+        <target name="create_run_jar" description="Create a JAR file that can be used to excute the JMapViewer demo app. Requires JMapViewer.jar to be present.">
                 <delete file="JMapViewer_Demo.jar" />
                 <jar destfile="JMapViewer_Demo.jar" filesetmanifest="mergewithoutmain">
                         <manifest>
-                                <attribute name="Built-By" value="${user.name}" />
                                 <attribute name="Main-Class" value="org.openstreetmap.gui.jmapviewer.Demo" />
-                                <attribute name="Class-Path" value="." />
+                                <attribute name="Class-Path" value="JMapViewer.jar" />
                         </manifest>
-                        <fileset dir="bin" includes="**/jmapviewer/**" />
-                        <fileset dir="src" includes="**/jmapviewer/**/*.java" />
                 </jar>
         </target>
+
+        <target name="create_release_zip" description="Create a release zip file containing the binary and source jar files as well as the demo starter">
+                <delete file="JMapViewer.zip" />
+                <zip basedir="." destfile="JMapViewer.zip">
+                        <include name="JMapViewer*.jar" />
+                        <include name="Readme.txt" />
+                        <include name="Gpl.txt" />
+                </zip>
+        </target>
+
 </project>

@@ -4 +4 @@
 bin
 tiles
+JMapViewer.zip