From ff8362905479e21de5cc12288c592595f9f8f3a4 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sun, 23 Feb 2014 10:03:11 +0100 Subject: [PATCH] create eclipse configuration with gradle --- .gitignore | 10 +- build.gradle | 43 ++- eclipse/org.eclipse.jdt.core.prefs | 291 ++++++++++++++++++ eclipse/org.eclipse.jdt.ui.prefs | 3 + gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 4 + vtm-android-app | 2 +- vtm-android-example/build.gradle | 105 +++++-- vtm-android/build.gradle | 109 +++++-- vtm-ext-libs | 2 +- vtm-extras/build.gradle | 16 + vtm-gdx-android/build.gradle | 101 ++++++ vtm-gdx-android/proguard.cfg | 40 --- vtm-gdx-desktop/build.gradle | 36 ++- vtm-gdx-html/build.gradle | 93 ++++++ .../{war => src/main/webapp}/WEB-INF/web.xml | 0 .../{war => src/main/webapp}/index.html | 2 +- .../{war => src/main/webapp}/js/LICENSE | 0 .../{war => src/main/webapp}/js/README.md | 0 .../main/webapp}/js/_tessellate.js | 0 .../{war => src/main/webapp}/js/tessellate.js | 0 .../src/org/oscim/gdx/GwtDefinition.gwt.xml | 9 +- vtm/build.gradle | 16 +- 23 files changed, 756 insertions(+), 128 deletions(-) create mode 100644 eclipse/org.eclipse.jdt.core.prefs create mode 100644 eclipse/org.eclipse.jdt.ui.prefs create mode 100644 vtm-extras/build.gradle create mode 100644 vtm-gdx-android/build.gradle delete mode 100644 vtm-gdx-android/proguard.cfg create mode 100644 vtm-gdx-html/build.gradle rename vtm-gdx-html/{war => src/main/webapp}/WEB-INF/web.xml (100%) rename vtm-gdx-html/{war => src/main/webapp}/index.html (95%) rename vtm-gdx-html/{war => src/main/webapp}/js/LICENSE (100%) rename vtm-gdx-html/{war => src/main/webapp}/js/README.md (100%) rename vtm-gdx-html/{war => src/main/webapp}/js/_tessellate.js (100%) rename vtm-gdx-html/{war => src/main/webapp}/js/tessellate.js (100%) diff --git a/.gitignore b/.gitignore index 2f2206b5..fc926b29 100644 --- a/.gitignore +++ b/.gitignore @@ -15,9 +15,7 @@ build/ /vtm/libs/ /vtm-android-example/assets/ /vtm-gdx-desktop/assets/ -/vtm-gdx-html/war/assets/ -/vtm-gdx-html/war/WEB-INF/ -/vtm-gdx-html/war/org.oscim.gdx.GwtDefinition/ +/vtm-gdx-html/war/ /vtm-gdx-html/gwt-unitCache /vtm-gdx-ios/ /vtm-spatialite/ @@ -28,8 +26,14 @@ build/ /tmp/ /themes/ /vtm/assets/themes/ + .gradle .idea *.iml + +.settings +.classpath +.project + local.properties diff --git a/build.gradle b/build.gradle index 15959937..e7fa232a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,26 +1,35 @@ buildscript { - repositories { - mavenCentral() - mavenLocal() - } + repositories { + mavenCentral() + mavenLocal() + } - dependencies { - classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.2' - classpath 'com.android.tools.build:gradle:0.7.+' - - // https://github.com/dcendents/android-maven-plugin - classpath 'com.github.dcendents:android-maven-plugin:1.0' - } + dependencies { + classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.2' + } } allprojects { - group = 'org.oscim' - version = '0.5.9-SNAPSHOT' + apply plugin: 'idea' - repositories { - mavenCentral() - mavenLocal() - } + group = 'org.oscim' + version = '0.5.9-SNAPSHOT' + + repositories { + mavenCentral() + mavenLocal() + } } +subprojects { + apply plugin: 'eclipse' + task copySettings(type: Copy) { + from "$rootDir/eclipse" + into ".settings" + include '**/*' + } + + eclipseProject.dependsOn copySettings + +} diff --git a/eclipse/org.eclipse.jdt.core.prefs b/eclipse/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..28b67532 --- /dev/null +++ b/eclipse/org.eclipse.jdt.core.prefs @@ -0,0 +1,291 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +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.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=82 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=82 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=82 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=82 +org.eclipse.jdt.core.formatter.alignment_for_assignment=80 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=84 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=false +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +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=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +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 +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=100 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/eclipse/org.eclipse.jdt.ui.prefs b/eclipse/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000..e3301ca9 --- /dev/null +++ b/eclipse/org.eclipse.jdt.ui.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +formatter_profile=_eclipse-vtm +formatter_settings_version=12 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a59d6abb..1b961d76 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip diff --git a/settings.gradle b/settings.gradle index 8e79fb4c..09d5f4c6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,9 @@ include ':vtm' +include ':vtm-extras' include ':vtm-android' include ':vtm-android-example' include ':vtm-gdx' include ':vtm-gdx-desktop' +include ':vtm-gdx-html' +include ':vtm-gdx-android' +include ':vtm-android-app' diff --git a/vtm-android-app b/vtm-android-app index 873b9643..da1e3b8a 160000 --- a/vtm-android-app +++ b/vtm-android-app @@ -1 +1 @@ -Subproject commit 873b964335364db5b524d505451aa1a68ca62b52 +Subproject commit da1e3b8aa8c523e5e374d8e7329def769edb3c0a diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle index 20f86d98..67e58dcf 100644 --- a/vtm-android-example/build.gradle +++ b/vtm-android-example/build.gradle @@ -1,34 +1,95 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.8.+' + } +} + apply plugin: 'android' dependencies { - compile project(':vtm-android') - compile fileTree(dir: 'libs', include: '*.jar') + compile project(':vtm-android') + compile fileTree(dir: 'libs', include: '*.jar') } task copyAssets(type: Copy) { - from "$rootDir/vtm/assets" - into "assets" - include '**/*' + from "$rootDir/vtm/assets" + into "assets" + include '**/*' } -tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyAssets } +tasks.withType(JavaCompile) { compileTask -> + compileTask.dependsOn copyAssets } android { - compileSdkVersion 19 - buildToolsVersion '19.0.1' + compileSdkVersion 19 + buildToolsVersion '19.0.1' - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src', 'assets'] - resources.srcDirs = ['src', 'assets'] - aidl.srcDirs = ['src', 'assets'] - renderscript.srcDirs = ['src', 'assets'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src', 'assets'] + resources.srcDirs = ['src', 'assets'] + aidl.srcDirs = ['src', 'assets'] + renderscript.srcDirs = ['src', 'assets'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + + debug.setRoot('build-types/debug') + release.setRoot('build-types/release') + } +} + +// Including configurations into Eclipse +eclipse.classpath.plusConfigurations += configurations.compile + +eclipse.jdt{ + sourceCompatibility = 1.6 + targetCompatibility = 1.6 +} + +// Configuring Eclipse classpath +eclipse.classpath { + //customizing the classes output directory: + defaultOutputDir = file('bin/classes') + + file { + + // Manipulation of the classpath XML before merging local + // and generated copies + beforeMerged { classpath -> + // Remove all source entries to avoid overlap + classpath.entries.removeAll() { c -> + c.kind == 'src' + } + } + + // Direct manipulation of the generated classpath XML + withXml { + // Since non-default source directories are used + // they need to be manually added to the classpath XML + def node = it.asNode() + + // Main source directory + node.appendNode('classpathentry kind="src" path="src"') + // Generated code directory + node.appendNode('classpathentry kind="src" path="gen"') + } + } +} + +eclipse.project { + natures = ['com.android.ide.eclipse.adt.AndroidNature', + 'org.eclipse.jdt.core.javanature'] + + buildCommand 'com.android.ide.eclipse.adt.ResourceManagerBuilder' + buildCommand 'com.android.ide.eclipse.adt.PreCompilerBuilder' + buildCommand 'com.android.ide.eclipse.adt.ApkBuilder' + + linkedResource name: 'assets', type: '2', + locationUri: 'PARENT-1-PROJECT_LOC/vtm/assets' +} - debug.setRoot('build-types/debug') - release.setRoot('build-types/release') - } -} \ No newline at end of file diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle index e1f4fb1d..d087fdb3 100644 --- a/vtm-android/build.gradle +++ b/vtm-android/build.gradle @@ -1,29 +1,96 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.8.+' + + // for aar/maven stuff + // https://github.com/dcendents/android-maven-plugin + classpath 'com.github.dcendents:android-maven-plugin:1.0' + } +} + apply plugin: 'android-library' apply plugin: 'android-maven' dependencies { - compile fileTree(dir: "../vtm-ext-libs/vtm-android", include: 'native-libs-*.jar') - compile project(':vtm') - compile 'com.android.support:support-v4:19.0.1' - compile 'org.slf4j:slf4j-android:1.7.6' + compile project(':vtm') + compile files("${rootDir}/vtm-ext-libs/native-libs.jar") + compile 'com.android.support:support-v4:19.0.1' + compile 'org.slf4j:slf4j-android:1.7.6' } android { - compileSdkVersion 19 - buildToolsVersion '19.0.1' - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - - debug.setRoot('build-types/debug') - release.setRoot('build-types/release') - } + compileSdkVersion 19 + buildToolsVersion '19.0.1' + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + debug.setRoot('build-types/debug') + release.setRoot('build-types/release') + } } + + + +// Including configurations into Eclipse +eclipse.classpath.plusConfigurations += configurations.compile + +eclipse.jdt{ + sourceCompatibility = 1.6 + targetCompatibility = 1.6 +} + +eclipse.classpath { + + //customizing the classes output directory: + defaultOutputDir = file('bin/classes') + + file { + // Manipulation of the classpath XML before merging local + // and generated copies + beforeMerged { classpath -> + // Remove all source entries to avoid overlap + classpath.entries.removeAll() { c -> + c.kind == 'src' + } + } + + // only used to explode jni .so into aar + whenMerged { classpath -> + classpath.entries.findAll { entry -> + entry.path.contains('native-libs') }*.exported = false + } + + // Direct manipulation of the generated classpath XML + withXml { + // Since non-default source directories are used + // they need to be manually added to the classpath XML + def node = it.asNode() + // Main source directory and generated code directory + node.appendNode('classpathentry kind="src" path="src"') + node.appendNode('classpathentry kind="src" path="gen"') + + } + } +} + +eclipse.project { + + natures = ['com.android.ide.eclipse.adt.AndroidNature', + 'org.eclipse.jdt.core.javanature'] + buildCommand 'com.android.ide.eclipse.adt.ResourceManagerBuilder' + buildCommand 'com.android.ide.eclipse.adt.PreCompilerBuilder' + buildCommand 'com.android.ide.eclipse.adt.ApkBuilder' + + // use extracted jni .so in eclipse + linkedResource name: 'libs', type: '2', + locationUri: 'PARENT-1-PROJECT_LOC/vtm-ext-libs/vtm-android' +} + diff --git a/vtm-ext-libs b/vtm-ext-libs index dacb7458..cc278b23 160000 --- a/vtm-ext-libs +++ b/vtm-ext-libs @@ -1 +1 @@ -Subproject commit dacb74584da3024ace6e2c0926e768ce23b3a205 +Subproject commit cc278b239cea8bfc16f1915fb23f5e3ad93b2c7a diff --git a/vtm-extras/build.gradle b/vtm-extras/build.gradle new file mode 100644 index 00000000..15b47d72 --- /dev/null +++ b/vtm-extras/build.gradle @@ -0,0 +1,16 @@ +apply plugin: 'java' +apply plugin: 'maven' + +sourceSets { + main.java.srcDirs = ['src'] + main.resources.srcDirs = ['src'] +} + +dependencies { + compile project(':vtm') + compile 'com.google.protobuf:protobuf-java:2.4.1' + compile 'org.openstreetmap.osmosis:osmosis-osm-binary:0.43.1' + compile 'com.fasterxml.jackson.core:jackson-core:2.3.0' + compile 'com.vividsolutions:jts:1.13' +} + diff --git a/vtm-gdx-android/build.gradle b/vtm-gdx-android/build.gradle new file mode 100644 index 00000000..effa3abc --- /dev/null +++ b/vtm-gdx-android/build.gradle @@ -0,0 +1,101 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.8.+' + } +} + +apply plugin: 'android' + +dependencies { + compile project(':vtm-gdx') + compile files('../vtm-ext-libs/gdx/gdx-backend-android.jar') + compile fileTree(dir: 'libs', include: '*.jar') +} + +task copyAssets(type: Copy) { + from "$rootDir/vtm/assets" + into "assets" + include '**/*' +} + +tasks.withType(JavaCompile) { compileTask -> + compileTask.dependsOn copyAssets } + +android { + compileSdkVersion 19 + buildToolsVersion '19.0.1' + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src', 'assets'] + resources.srcDirs = ['src', 'assets'] + aidl.srcDirs = ['src', 'assets'] + renderscript.srcDirs = ['src', 'assets'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + + debug.setRoot('build-types/debug') + release.setRoot('build-types/release') + } +} + +// Including configurations into Eclipse +eclipse.classpath.plusConfigurations += configurations.compile + +eclipse.jdt{ + sourceCompatibility = 1.6 + targetCompatibility = 1.6 +} + +// Configuring Eclipse classpath +eclipse.classpath { + //customizing the classes output directory: + defaultOutputDir = file('bin/classes') + + file { + + // Manipulation of the classpath XML before merging local + // and generated copies + beforeMerged { classpath -> + // Remove all source entries to avoid overlap + classpath.entries.removeAll() { c -> + c.kind == 'src' + } + } + + // Direct manipulation of the generated classpath XML + withXml { + // Since non-default source directories are used + // they need to be manually added to the classpath XML + def node = it.asNode() + + // Main source directory + node.appendNode('classpathentry kind="src" path="src"') + // Generated code directory + node.appendNode('classpathentry kind="src" path="gen"') + } + } +} + +eclipse.project { + natures = ['com.android.ide.eclipse.adt.AndroidNature', + 'org.eclipse.jdt.core.javanature'] + + buildCommand 'com.android.ide.eclipse.adt.ResourceManagerBuilder' + buildCommand 'com.android.ide.eclipse.adt.PreCompilerBuilder' + buildCommand 'com.android.ide.eclipse.adt.ApkBuilder' + + linkedResource name: 'assets', type: '2', + locationUri: 'PARENT-1-PROJECT_LOC/vtm/assets' + + // use extracted jni .so in eclipse + linkedResource name: 'libs', type: '2', + locationUri: 'PARENT-1-PROJECT_LOC/vtm-ext-libs/vtm-gdx-android' + +} + diff --git a/vtm-gdx-android/proguard.cfg b/vtm-gdx-android/proguard.cfg deleted file mode 100644 index b1cdf17b..00000000 --- a/vtm-gdx-android/proguard.cfg +++ /dev/null @@ -1,40 +0,0 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgentHelper --keep public class * extends android.preference.Preference --keep public class com.android.vending.licensing.ILicensingService - --keepclasseswithmembernames class * { - native ; -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers class * extends android.app.Activity { - public void *(android.view.View); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -} diff --git a/vtm-gdx-desktop/build.gradle b/vtm-gdx-desktop/build.gradle index d4a08e83..94325074 100644 --- a/vtm-gdx-desktop/build.gradle +++ b/vtm-gdx-desktop/build.gradle @@ -6,28 +6,34 @@ apply plugin: 'application' mainClassName = 'org.oscim.gdx.GdxMapApp' task copyAssets(type: Copy) { - from "$rootDir/vtm/assets" - into "assets" - include '**/*' + from "$rootDir/vtm/assets" + into "assets" + include '**/*' } -tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyAssets } +tasks.withType(JavaCompile) { compileTask -> + compileTask.dependsOn copyAssets } sourceSets { - main.java.srcDirs = ['src'] - main.resources.srcDirs = ['src'] - main.resources.srcDirs = ['assets'] - output.resourcesDir = 'assets' + main.java.srcDirs = ['src'] + main.resources.srcDirs = ['src'] + main.resources.srcDirs = ['assets'] + output.resourcesDir = 'assets' } run { ignoreExitValue = true } dependencies { - compile project(':vtm-gdx') - compile files('../vtm-ext-libs/gdx/gdx-backend-lwjgl.jar') - compile files('../vtm-ext-libs/gdx/gdx-backend-lwjgl-natives.jar') - compile files('../vtm-ext-libs/gdx/gdx-natives.jar') - compile files('../vtm-ext-libs/gdx/vtm-jni-natives.jar') - compile 'org.slf4j:slf4j-api:1.7.5' - compile 'org.slf4j:slf4j-simple:1.7.5' + compile project(':vtm-gdx') + compile files('../vtm-ext-libs/gdx/gdx-backend-lwjgl.jar') + compile files('../vtm-ext-libs/gdx/gdx-backend-lwjgl-natives.jar') + compile files('../vtm-ext-libs/gdx/gdx-natives.jar') + compile files('../vtm-ext-libs/gdx/vtm-jni-natives.jar') + //compile 'org.slf4j:slf4j-api:1.7.5' + compile 'org.slf4j:slf4j-simple:1.7.5' } + +eclipse.project { + linkedResource name: 'assets', type: '2', + locationUri: 'PARENT-1-PROJECT_LOC/vtm/assets' +} \ No newline at end of file diff --git a/vtm-gdx-html/build.gradle b/vtm-gdx-html/build.gradle new file mode 100644 index 00000000..30fe8a9d --- /dev/null +++ b/vtm-gdx-html/build.gradle @@ -0,0 +1,93 @@ +buildscript { + repositories { + maven { + url 'https://github.com/steffenschaefer/gwt-gradle-plugin/raw/maven-repo/' + } + mavenCentral() + } + dependencies { + classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.3' + } +} + +apply plugin: 'war' +apply plugin: 'jetty' +apply plugin: 'gwt' +apply plugin: 'eclipse' + +sourceSets { + main.java.srcDirs = ['src', 'src/org/oscim/gdx/emu'] + //main.resources.srcDirs = ['src'] + //main.resources.srcDirs = ['resources'] + //output.resourcesDir = 'war' +} + + +dependencies { + compile project(':vtm-gdx') + providedCompile files('../vtm-ext-libs/gdx/gdx-sources.jar') + providedCompile files('../vtm-ext-libs/gdx/gdx-backend-gwt-sources.jar') + providedCompile files('../vtm-ext-libs/gdx/gdx-backend-gwt.jar') + providedCompile 'ru.finam:slf4j-gwt:1.2.1' + providedCompile 'org.slf4j:slf4j-api:1.7.5' +} + +task copyAssets(type: Copy) { + from "$rootDir/vtm/assets" + into "$buildDir/gwt/draftOut/assets" + include '**/*' +} + + +//compileGwt.dependsOn copyAssets +//draftCompileGwt.dependsOn copyAssets + +gwt { + gwtVersion='2.5.1' + modules 'org.oscim.gdx.GwtDefinition' + + superDev { + noPrecompile=true + } + + src += files(sourceSets.main.java.srcDirs) + src += files(project(':vtm').sourceSets.main.allJava.srcDirs) + //src += files(project(':vtm').sourceSets.main.output.resourcesDir) + + src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs) + //src += files(project(':vtm-gdx').sourceSets.main.output.resourcesDir) + //src += files(project(':vtm-gdx-html').sourceSets.main.allJava.srcDirs) +} + + +// Configuring Eclipse classpath +eclipse.classpath { + //customizing the classes output directory: + defaultOutputDir = file('war/WEB-INF/classes') + + file { + + whenMerged { classpath -> + classpath.entries.findAll { entry -> + entry.path == 'src' }*.excludes = ['main','org/oscim/gdx/emu/'] + } + // Direct manipulation of the generated classpath XML + //withXml { + // Since non-default source directories are used + // they need to be manually added to the classpath XML + // def node = it.asNode() + //node.remove + // Main source directory + // node.appendNode('classpathentry excluding="main/|org/oscim/gdx/emu/" kind="src" path="src"') + // Generated code directory + //node.appendNode('classpathentry kind="src" path="gen"') + // } + } +} + + +task jettyDraftWar(type: JettyRunWar) { + dependsOn draftWar + dependsOn.remove('war') + webApp=draftWar.archivePath +} \ No newline at end of file diff --git a/vtm-gdx-html/war/WEB-INF/web.xml b/vtm-gdx-html/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from vtm-gdx-html/war/WEB-INF/web.xml rename to vtm-gdx-html/src/main/webapp/WEB-INF/web.xml diff --git a/vtm-gdx-html/war/index.html b/vtm-gdx-html/src/main/webapp/index.html similarity index 95% rename from vtm-gdx-html/war/index.html rename to vtm-gdx-html/src/main/webapp/index.html index 1faaf24a..c3a7d5b9 100644 --- a/vtm-gdx-html/war/index.html +++ b/vtm-gdx-html/src/main/webapp/index.html @@ -126,7 +126,7 @@