diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-04-03 11:59:54 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-04-03 11:59:54 +0200 |
| commit | 063029492a4bae92fcc543d543d7d2bf0b4e1763 (patch) | |
| tree | 272c804eaf5638e60be2ba90bf8cb1cfb82863dd | |
| parent | 82120be1fb1668fb7e11d375c845030438f8837f (diff) | |
Dropped cpp support: outdated, complex to maintain and never finished
29 files changed, 12 insertions, 2582 deletions
diff --git a/build/build.xml b/build/build.xml index f110896..53397fe 100644 --- a/build/build.xml +++ b/build/build.xml @@ -44,19 +44,17 @@ <import file="../core/build.xml"/> <import file="../java/build.xml"/> - <import file="../cpp/build.xml"/> <target name="help" description="Tells how to run the script"> <echo> This ant file has to be called with the following parameters: - -Dopenoffice.home=/path/to/your/ooo/ + -Dlibreoffice.home=/path/to/your/libreoffice/ -Declipse.home=/path/to/your/eclipse/ To disable the build of a language plugin, define the corresponding variable amongst the following ones. By default all the plugins are built. The value of these parameters can be anything: they only have to be defined. - -Dcpp.nobuild=true -Djava.nobuild=true These arguments can be either put in the command line or in an @@ -72,12 +70,12 @@ <target name="check-ooo-version"> - <property name="office.linux.basis.dir" value="${openoffice.home}"/> + <property name="office.linux.basis.dir" value="${libreoffice.home}"/> <property name="office.linux.ure.dir" value="${office.linux.basis.dir}${file.separator}ure-link"/> <!-- Needed due to some differences between Windows and Linux installs --> <loadfile property="office.win.basis.name" srcfile="${office.linux.basis.dir}" failonerror="false" quiet="true" /> - <property name="office.win.basis.dir" value="${openoffice.home}${file.separator}${office.win.basis.name}"/> + <property name="office.win.basis.dir" value="${libreoffice.home}${file.separator}${office.win.basis.name}"/> <loadfile property="office.win.ure.name" srcfile="${office.win.basis.dir}${file.separator}ure-link" failonerror="false" quiet="true" /> <property name="office.win.ure.dir" value="${office.win.basis.dir}${file.separator}${office.win.ure.name}"/> @@ -114,7 +112,7 @@ </target> <target name="init-env-ooo3" depends="init-win-ooo3, init-linux-ooo3" if="office.version3"> - <echo message="Initializing the properties for OpenOffice 3.x"/> + <echo message="Initializing the properties for LibreOffice 3.x"/> <condition property="office.ure.dir.java.folder" value="${office.ure.dir}${file.separator}share${file.separator}java"> <not> @@ -140,14 +138,14 @@ <echo message="Initializing the properties for OpenOffice 2.x"/> <path id="office.class.path"> - <fileset dir="${openoffice.home}${file.separator}program${file.separator}classes"> + <fileset dir="${libreoffice.home}${file.separator}program${file.separator}classes"> <include name="*.jar"/> </fileset> </path> </target> <target name="init-env" - depends="init-env-ooo2, init-env-ooo3, core.init-env, java.init-env, cpp.init-env"> + depends="init-env-ooo2, init-env-ooo3, core.init-env, java.init-env"> <property name="package.prefix" value="org.openoffice.ide.eclipse"/> <dirname property="build.basedir" file="${ant.file.ooeclipseintegration}"/> @@ -170,14 +168,14 @@ </target> <target name="purge" description="Cleans all the output results" - depends="core.purge, java.purge, cpp.purge"> + depends="core.purge, java.purge"> <delete dir="../site"/> <delete file="../ooeclipseintegration_site.zip" /> </target> - <target name="versions" depends="core.version, java.version, cpp.version" /> + <target name="versions" depends="core.version, java.version" /> - <target name="core.feature" depends="versions, java.feature, cpp.feature"> + <target name="core.feature" depends="versions, java.feature"> <copy file="features/core/feature.xml" tofile="${out.path}/features/feature.xml"> <filterchain> @@ -225,38 +223,8 @@ <target name="java.feature" depends="java.feature.build, java.feature.nobuild"/> - <target name="cpp.feature.nobuild" if="cpp.nobuild"> - <property name="includes.cpp" value="" /> - </target> - - <target name="cpp.feature.build" depends="versions" unless="cpp.nobuild"> - <copy file="features/cpp/feature.xml" - tofile="${out.path}/features/feature.xml"> - <filterchain> - <expandproperties/> - </filterchain> - </copy> - - <jar destfile="${out.path}/features/${package.prefix}.cpp_${cpp.Bundle-Version}.jar"> - <zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true"> - <include name="feature.xml"/> - </zipfileset> - </jar> - - <loadfile property="includes.cpp" - srcfile="features/cpp/includes.xml"> - <filterchain> - <expandproperties/> - </filterchain> - </loadfile> - - <delete file="${out.path}/features/feature.xml"/> - </target> - - <target name="cpp.feature" depends="cpp.feature.build, cpp.feature.nobuild"/> - - <target name="features" depends="versions, java.feature, cpp.feature, core.feature"/> - <target name="plugins" depends="core.plugin, java.plugin, cpp.plugin"/> + <target name="features" depends="versions, java.feature, core.feature"/> + <target name="plugins" depends="core.plugin, java.plugin"/> <macrodef name="equinoxLauncher"> <attribute name="application"/> @@ -293,7 +261,7 @@ </sequential> </macrodef> - <target name="site" depends="init-env, plugins, features, core.site, java.site, cpp.site" + <target name="site" depends="init-env, plugins, features, core.site, java.site" description="Creates the Eclipse update site"> <!-- diff --git a/cpp/.checkstyle b/cpp/.checkstyle deleted file mode 100644 index 866dd7c..0000000 --- a/cpp/.checkstyle +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<fileset-config file-format-version="1.2.0" simple-config="true"> - <local-check-config name="OOEclipse checks" location="/org.openoffice.ide.eclipse.build/checkstyle.xml" type="project" description=""> - <additional-data name="protect-config-file" value="false"/> - </local-check-config> - <fileset name="all" enabled="true" check-config-name="OOEclipse checks" local="true"> - <file-match-pattern match-pattern="." include-pattern="true"/> - </fileset> -</fileset-config> diff --git a/cpp/.classpath b/cpp/.classpath deleted file mode 100644 index d154f35..0000000 --- a/cpp/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="source"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/cpp/.project b/cpp/.project deleted file mode 100644 index 9acd25e..0000000 --- a/cpp/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.openoffice.ide.eclipse.cpp</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> - </natures> -</projectDescription> diff --git a/cpp/.settings/org.eclipse.jdt.core.prefs b/cpp/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ee7c691..0000000 --- a/cpp/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,266 +0,0 @@ -#Wed Jun 16 14:39:29 CEST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -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 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -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_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_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_selector_in_method_invocation=16 -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.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=true -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=insert -org.eclipse.jdt.core.formatter.comment.line_length=120 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=4 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=4 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=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_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not 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_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_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_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_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_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=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 -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=120 -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=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/cpp/.settings/org.eclipse.jdt.ui.prefs b/cpp/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 90c6cfc..0000000 --- a/cpp/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,56 +0,0 @@ -#Wed Jun 16 14:43:55 CEST 2010 -cleanup.add_default_serial_version_id=false -cleanup.add_generated_serial_version_id=true -cleanup.add_missing_annotations=true -cleanup.add_missing_deprecated_annotations=true -cleanup.add_missing_methods=false -cleanup.add_missing_nls_tags=false -cleanup.add_missing_override_annotations=true -cleanup.add_serial_version_id=true -cleanup.always_use_blocks=true -cleanup.always_use_parentheses_in_expressions=false -cleanup.always_use_this_for_non_static_field_access=false -cleanup.always_use_this_for_non_static_method_access=false -cleanup.convert_to_enhanced_for_loop=false -cleanup.correct_indentation=true -cleanup.format_source_code=false -cleanup.format_source_code_changes_only=false -cleanup.make_local_variable_final=true -cleanup.make_parameters_final=false -cleanup.make_private_fields_final=true -cleanup.make_type_abstract_if_missing_method=false -cleanup.make_variable_declarations_final=false -cleanup.never_use_blocks=false -cleanup.never_use_parentheses_in_expressions=true -cleanup.organize_imports=true -cleanup.qualify_static_field_accesses_with_declaring_class=false -cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -cleanup.qualify_static_member_accesses_with_declaring_class=true -cleanup.qualify_static_method_accesses_with_declaring_class=false -cleanup.remove_private_constructors=true -cleanup.remove_trailing_whitespaces=true -cleanup.remove_trailing_whitespaces_all=true -cleanup.remove_trailing_whitespaces_ignore_empty=false -cleanup.remove_unnecessary_casts=true -cleanup.remove_unnecessary_nls_tags=true -cleanup.remove_unused_imports=true -cleanup.remove_unused_local_variables=false -cleanup.remove_unused_private_fields=true -cleanup.remove_unused_private_members=false -cleanup.remove_unused_private_methods=true -cleanup.remove_unused_private_types=true -cleanup.sort_members=false -cleanup.sort_members_all=false -cleanup.use_blocks=true -cleanup.use_blocks_only_for_return_and_throw=false -cleanup.use_parentheses_in_expressions=true -cleanup.use_this_for_non_static_field_access=false -cleanup.use_this_for_non_static_field_access_only_if_necessary=true -cleanup.use_this_for_non_static_method_access=false -cleanup.use_this_for_non_static_method_access_only_if_necessary=true -cleanup_profile=_OOEclipse -cleanup_settings_version=2 -eclipse.preferences.version=1 -formatter_profile=_OOEclipse -formatter_settings_version=11 diff --git a/cpp/META-INF/MANIFEST.MF b/cpp/META-INF/MANIFEST.MF deleted file mode 100644 index 6773b9f..0000000 --- a/cpp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: C++ extensions support for OOo -Bundle-SymbolicName: org.openoffice.ide.eclipse.cpp;singleton:=true -Bundle-Version: 0.5.0 -Bundle-Activator: org.openoffice.ide.eclipse.cpp.Activator -Bundle-Vendor: Cédric Bosdonnat -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.openoffice.ide.eclipse.core;bundle-version="1.1.0", - org.eclipse.core.resources;bundle-version="3.4.1", - org.eclipse.cdt.core;bundle-version="5.0.1", - org.eclipse.cdt.managedbuilder.core;bundle-version="5.0.1", - org.eclipse.cdt.ui;bundle-version="5.1.0", - org.eclipse.ui.ide;bundle-version="3.5.0", - org.eclipse.ui.cheatsheets, - org.openoffice.ide.eclipse.packager.core;bundle-version="0.1.0", - org.eclipse.debug.core -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ActivationPolicy: lazy diff --git a/cpp/build.properties b/cpp/build.properties deleted file mode 100644 index 3e8b980..0000000 --- a/cpp/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = source/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/cpp/build.xml b/cpp/build.xml deleted file mode 100644 index 7ddea43..0000000 --- a/cpp/build.xml +++ /dev/null @@ -1,128 +0,0 @@ -<?xml version="1.0"?> -<!-- ====================================================================== - * $RCSfile: build.xml,v $ - * - * $Revision: 1.8 $ - * - * last change: $Author: cedricbosdo $ $Date: 2008/12/13 13:43:02 $ - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * Sun Microsystems Inc., October, 2000 - * - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Sun Microsystems, Inc.. - * - * Copyright: 2002 by Sun Microsystems, Inc. - * - * All Rights Reserved. - * - * Contributor(s): Cedric Bosdonnat - ====================================================================== --> - -<project name="cpp" default="cpp.error"> - - <target name="cpp.error"> - <fail>Wrong target! - - This script should not be executed directly. - Please, use the one in the build project - </fail> - </target> - - - <target name="init-env" unless="cpp.nobuild"> - <dirname property="cpp.basedir" file="${ant.file.cpp}"/> - - <property name="cpp.out.path" value="${cpp.basedir}/bin/ant" /> - <property name="cpp.out.classes" value="${cpp.out.path}/classes"/> - <property name="cpp.sources" value="${cpp.basedir}/source"/> - - <path id="cpp.dependencies.path"> - <pathelement location="${packager.out.classes}"/> - <pathelement location="${core.out.classes}"/> - - <fileset dir="${eclipse.home}/plugins/"> - <include name="org.eclipse*.jar"/> - </fileset> - </path> - - <mkdir dir="${cpp.out.path}/plugins" /> - <mkdir dir="${cpp.out.classes}" /> - </target> - - <target name="cpp.version" depends="init-env" unless="cpp.nobuild"> - <property name="manifest.properties" value="MANIFEST-MF.properties"/> - <copy tofile="${manifest.properties}" file="${cpp.basedir}/META-INF/MANIFEST.MF"/> - <replace file="${manifest.properties}" token=":" value="="/> - <property file="${manifest.properties}" prefix="cpp"/> - <delete file="${manifest.properties}" /> - </target> - - <target name="purge" depends="init-env"> - <property name="cpp.out.path" value="${cpp.basedir}/bin/ant" /> - <delete dir="${cpp.out.path}" /> - </target> - - <target name="cpp.compile" depends="init-env" unless="cpp.nobuild"> - <javac srcdir="${cpp.sources}" destdir="${cpp.out.classes}" - target="1.5" source="1.5" - debug="${debug}" - classpathref="cpp.dependencies.path" - excludes="**/unittests/**"/> - </target> - - <target name="cpp.plugin" depends="cpp.version, cpp.compile" unless="cpp.nobuild"> - <jar destfile="${cpp.out.path}/plugins/${package.prefix}.cpp_${cpp.Bundle-Version}.jar" - manifest="${cpp.basedir}/META-INF/MANIFEST.MF"> - <zipfileset prefix="" dir="${cpp.sources}"> - <exclude name="**/*.java"/> - </zipfileset> - <zipfileset prefix="" dir="${cpp.out.classes}"/> - - <zipfileset prefix="icons" dir="${cpp.basedir}/icons"/> - <zipfileset prefix="" file="${cpp.basedir}/plugin.xml" /> - </jar> - </target> - - <target name="cpp.site" depends="cpp.plugin" unless="cpp.nobuild"> - - <!-- Echo the needed bits for site.xml --> - <copy tofile="${out.path}/site-cpp.xml" file="${build.basedir}/site-feature.xml" /> - <replace file="${out.path}/site-cpp.xml" token="@@URL@@" value="features/org.openoffice.ide.eclipse.cpp_${cpp.Bundle-Version}.jar"/> - <replace file="${out.path}/site-cpp.xml" token="@@ID@@" value="org.openoffice.ide.eclipse.cpp"/> - <replace file="${out.path}/site-cpp.xml" token="@@VERSION@@" value="${cpp.Bundle-Version}"/> - - <!-- Copying the plugins --> - <copy todir="${out.path}/plugins"> - <fileset dir="${cpp.out.path}/plugins/" - includes="*.jar" /> - <mapper type="flatten" /> - </copy> - - <!-- Preparing the plugins for p2 update site --> - <prepareJar jar="${out.path}/plugins/${package.prefix}.cpp_${cpp.Bundle-Version}.jar" outdir="${out.path}/plugins"/> - </target> - -</project> - diff --git a/cpp/doc/cheatsheets/unoclient.xml b/cpp/doc/cheatsheets/unoclient.xml deleted file mode 100644 index 8cd4c60..0000000 --- a/cpp/doc/cheatsheets/unoclient.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<cheatsheet - title="Create a C++ UNO client"> - <intro> - <description> - OpenOffice.org can be used as well as a server. Creating clients connecting to it is not an easy task for beginners and the informations are split all over the web. -<br/><br/> -<b>Follow the next steps to create a new C++ UNO Client really quickly.</b> - </description> - </intro> - <item - title="Create the C++ UNO Client"> - <description> - Create a new project of type <b>C++ UNO Client application</b>. -<br/><br/> -Configure the OpenOffice.org instance and SDK used to build to program and configure the OpenOffice.org connection. - </description> - <command - required="true" - serialization="org.eclipse.ui.newWizard(newWizardId=org.openoffice.ide.eclipse.cpp.client)"/> - </item> - <item - title="Write the client code"> - <description> - <b>Replace the TODO comment</b> by the code using the UNO connection to OpenOffice.org. - </description> - </item> - <item - title="Create a launch configuration"> - <description> - Create a C++ Application run configuration. -<br/><br/> -Don't forget to add the <b>LD_LIBRARY_PATH or PATH</b> in the environment variables and set it to the path to the <b>ure/lib</b> folder in the OpenOffice.org installation. - </description> - <command - required="true" - serialization="org.eclipse.debug.ui.commands.OpenRunConfigurations"/> - </item> - <item - skip="false" - title="Start OpenOffice.org"> - <description> - OpenOffice.org needs to be started with the following parameter depending on your connection configuration: -<br/><br/> -<b>Pipe connection: </b><br/> -accept="pipe,name=<b>pipename</b>;urp;StarOffice.ServiceManager" -<br/><br/> -<b>Socket connection: </b><br/> -accept="socket,host=<b>host</b>,port=<b>port</b>;urp;StarOffice.ServiceManager" - </description> - </item> - <item - title="Run the client"> - <description> - <b>Everything is done!</b> Now run the new UNO client program. - </description> - </item> -</cheatsheet> diff --git a/cpp/icons/uno_client.png b/cpp/icons/uno_client.png Binary files differdeleted file mode 100644 index d58ec3e..0000000 --- a/cpp/icons/uno_client.png +++ /dev/null diff --git a/cpp/icons/uno_client_wiz.png b/cpp/icons/uno_client_wiz.png Binary files differdeleted file mode 100644 index ae74ced..0000000 --- a/cpp/icons/uno_client_wiz.png +++ /dev/null diff --git a/cpp/plugin.xml b/cpp/plugin.xml deleted file mode 100644 index 7ec255f..0000000 --- a/cpp/plugin.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.2"?> -<plugin> - <extension - point="org.openoffice.ide.eclipse.core.language"> - <language - class="org.openoffice.ide.eclipse.cpp.Language" - name="C++"> - </language> - </extension> - <extension - point="org.eclipse.ui.newWizards"> - <wizard - canFinishEarly="false" - category="org.openoffice.ide.eclipse.core" - class="org.openoffice.ide.eclipse.cpp.client.ClientWizard" - hasPages="true" - icon="icons/uno_client.png" - id="org.openoffice.ide.eclipse.cpp.client" - name="C++ UNO client application" - project="true"> - </wizard> - </extension> - <extension - point="org.eclipse.ui.cheatsheets.cheatSheetContent"> - <cheatsheet - category="org.openoffice.ide.eclipse.core.cheatsheets" - composite="false" - contentFile="doc/cheatsheets/unoclient.xml" - id="org.openoffice.ide.eclipse.cpp.unoclient" - name="Create a C++ UNO Client"> - </cheatsheet> - </extension> - -</plugin> diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/Activator.java b/cpp/source/org/openoffice/ide/eclipse/cpp/Activator.java deleted file mode 100644 index 0033025..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/Activator.java +++ /dev/null @@ -1,78 +0,0 @@ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2009 by Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Cédric Bosdonnat. - * - * Copyright: 2009 by Novell, Inc. - * - * All Rights Reserved. - * - ************************************************************************/ -package org.openoffice.ide.eclipse.cpp; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle. - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.openoffice.ide.eclipse.cpp"; //$NON-NLS-1$ - - // The shared instance - private static Activator sPlugin; - - /** - * The constructor. - */ - public Activator() { - } - - /** - * {@inheritDoc} - */ - public void start(BundleContext pContext) throws Exception { - super.start(pContext); - sPlugin = this; - } - - /** - * {@inheritDoc} - */ - public void stop(BundleContext pContext) throws Exception { - sPlugin = null; - super.stop(pContext); - } - - /** - * Returns the shared instance. - * - * @return the shared instance - */ - public static Activator getDefault() { - return sPlugin; - } - -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/CDTHelper.java b/cpp/source/org/openoffice/ide/eclipse/cpp/CDTHelper.java deleted file mode 100644 index a7ff37e..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/CDTHelper.java +++ /dev/null @@ -1,218 +0,0 @@ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2009 by Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Cédric Bosdonnat. - * - * Copyright: 2009 by Novell, Inc. - * - * All Rights Reserved. - * - ************************************************************************/ -package org.openoffice.ide.eclipse.cpp; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CProjectNature; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.core.settings.model.ICFolderDescription; -import org.eclipse.cdt.core.settings.model.ICLanguageSetting; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.managedbuilder.core.IConfiguration; -import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; -import org.eclipse.cdt.managedbuilder.core.IOption; -import org.eclipse.cdt.managedbuilder.core.ITool; -import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; -import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.openoffice.ide.eclipse.core.PluginLogger; - -/** - * Utility class providing shortcuts for CDT operations on projects. - * - * @author cbosdonnat - * - */ -public class CDTHelper { - - /** - * Add the C++ project nature and all the other needed natures. - * - * @param pProject the project on which to set the natures - * @param pMonitor a progress monitor - * - * @throws CoreException if anything wrong happens - */ - public static void addCDTNature( IProject pProject, IProgressMonitor pMonitor ) throws CoreException { - if (!pProject.exists()) { - pProject.create( pMonitor ); - PluginLogger.debug( - "Project created during language specific operation"); //$NON-NLS-1$ - } - - if (!pProject.isOpen()) { - pProject.open( pMonitor ); - PluginLogger.debug("Project opened"); //$NON-NLS-1$ - } - - CProjectNature.addCNature(pProject, pMonitor ); - CCProjectNature.addCCNature( pProject, pMonitor ); - ManagedCProjectNature.addManagedNature( pProject, pMonitor ); - } - - /** - * Add some configuration entries like includes, macros, libraries paths. - * - * @param pProject the project on which to add the entries - * @param pNewEntries the new entries to add - * @param pEntriesType the entries type in {@link ICSettingEntry} - * - * @see #changeEntries(IProject, ICLanguageSettingEntry[], int, boolean) - */ - public static void addEntries( IProject pProject, ICLanguageSettingEntry[] pNewEntries, int pEntriesType ) { - changeEntries( pProject, pNewEntries, pEntriesType, false ); - } - - /** - * Remove some configuration entries like includes, macros, libraries paths. - * - * @param pProject the project on which to remove the entries - * @param pOldEntries the new entries to remove - * @param pEntriesType the entries type in {@link ICSettingEntry} - * - * @see #changeEntries(IProject, ICLanguageSettingEntry[], int, boolean) - */ - public static void removeEntries( IProject pProject, ICLanguageSettingEntry[] pOldEntries, int pEntriesType ) { - changeEntries( pProject, pOldEntries, pEntriesType, true ); - } - - /** - * Add/Remove some configuration entries like includes, macros, libraries paths. - * - * @param pProject the project to handle - * @param pEntries the entries to add/remove - * @param pEntriesType the entries type in {@link ICSettingEntry} - * @param pRemove <code>true</code> if the entries have to be removed, <code>false</code> - * if they have to be added - */ - private static void changeEntries( IProject pProject, ICLanguageSettingEntry[] pEntries, - int pEntriesType, boolean pRemove ) { - ICProjectDescription prjDesc = CoreModel.getDefault().getProjectDescription( pProject ); - ICConfigurationDescription[] configs = prjDesc.getConfigurations(); - - // Set them on all the languages of all the configurations - for (ICConfigurationDescription config : configs) { - ICFolderDescription folder = config.getRootFolderDescription(); - ICLanguageSetting[] languages = folder.getLanguageSettings(); - for (ICLanguageSetting lang : languages) { - List<ICLanguageSettingEntry> entries = lang.getSettingEntriesList( pEntriesType ); - for ( ICLanguageSettingEntry entry : pEntries ) { - boolean contained = entries.contains( entry ); - if ( contained && pRemove ) { - entries.remove( entry ); - } else if ( !contained && !pRemove ) { - entries.add( entry ); - } - } - lang.setSettingEntries( pEntriesType, entries ); - } - } - - try { - CoreModel.getDefault().setProjectDescription( pProject, prjDesc ); - } catch ( CoreException e ) { - PluginLogger.error( Messages.getString("CDTHelper.PathEntryError"), e ); //$NON-NLS-1$ - } - } - - /** - * Add some libraries (-l gcc option) to the project. - * - * @param pProject the project to handle - * @param pLibNames the libraries to add - * - * @see #changeLibs(IProject, String[], boolean) - */ - public static void addLibs( IProject pProject, String[] pLibNames ) { - changeLibs( pProject, pLibNames, false ); - } - - /** - * Remove some libraries (-l gcc option) to the project. - * - * @param pProject the project to handle - * @param pLibNames the libraries to remove - * - * @see #changeLibs(IProject, String[], boolean) - */ - public static void removeLibs( IProject pProject, String[] pLibNames ) { - changeLibs( pProject, pLibNames, true ); - } - - /** - * Add/remove some libraries (-l gcc option) to the project. - * - * @param pProject the project to handle - * @param pLibNames the libraries to add/remove - * @param pRemove <code>true</code> if the libs have to be removed, - * <code>false</code> if they have to be added - */ - private static void changeLibs( IProject pProject, String[] pLibNames, boolean pRemove ) { - IManagedBuildInfo infos = ManagedBuildManager.getBuildInfo( pProject ); - IConfiguration[] configs = infos.getManagedProject().getConfigurations(); - - for (IConfiguration config : configs ) { - ITool tool = config.calculateTargetTool(); - IOption[] options = tool.getOptions(); - for (IOption option : options) { - try { - if ( option.getValueType() == IOption.LIBRARIES ) { - // Append the libraries if not already set - String[] libs = option.getLibraries(); - ArrayList<String> newLibs = new ArrayList<String>( Arrays.asList( libs ) ); - for ( String lib : pLibNames ) { - boolean contained = newLibs.contains( lib ); - if ( !contained && !pRemove ) { - newLibs.add( lib ); - } else if ( contained && pRemove ) { - newLibs.remove( lib ); - } - } - ManagedBuildManager.setOption(config, tool, option, - newLibs.toArray( new String[ newLibs.size() ] ) ); - } - } catch ( Exception e ) { - PluginLogger.error( Messages.getString("CDTHelper.LinkerOptionsError"), e ); //$NON-NLS-1$ - } - } - } - ManagedBuildManager.saveBuildInfo( pProject, false ); - } -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/CppBuilder.java b/cpp/source/org/openoffice/ide/eclipse/cpp/CppBuilder.java deleted file mode 100644 index ea2539e..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/CppBuilder.java +++ /dev/null @@ -1,152 +0,0 @@ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2009 by Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Cédric Bosdonnat. - * - * Copyright: 2009 by Novell, Inc. - * - * All Rights Reserved. - * - ************************************************************************/ -package org.openoffice.ide.eclipse.cpp; - -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.LineNumberReader; - -import org.eclipse.cdt.core.settings.model.CIncludePathEntry; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.openoffice.ide.eclipse.core.LogLevels; -import org.openoffice.ide.eclipse.core.PluginLogger; -import org.openoffice.ide.eclipse.core.model.IUnoidlProject; -import org.openoffice.ide.eclipse.core.model.ProjectsManager; -import org.openoffice.ide.eclipse.core.model.config.IOOo; -import org.openoffice.ide.eclipse.core.model.config.ISdk; -import org.openoffice.ide.eclipse.core.model.language.ILanguageBuilder; -import org.openoffice.plugin.core.model.UnoPackage; - -/** - * Helper class for the C++ UNO internal build tools. - * - * @author cbosdonnat - * - */ -public class CppBuilder implements ILanguageBuilder { - - public static final String INCLUDE = "include"; //$NON-NLS-1$ - - /** - * {@inheritDoc} - */ - public IFile createLibrary(IUnoidlProject pUnoProject) throws Exception { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public void fillUnoPackage(UnoPackage pUnoPackage, IUnoidlProject pPrj) { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public String[] getBuildEnv(IUnoidlProject pUnoProject) { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public void generateFromTypes(ISdk pSdk, IOOo pOoo, IProject pPrj, - File pTypesFile, File pBuildFolder, String pRootModule, - IProgressMonitor pMonitor) { - - if (pTypesFile.exists()) { - - try { - - if (null != pSdk && null != pOoo) { - - String[] paths = pOoo.getTypesPath(); - String oooTypesArgs = ""; //$NON-NLS-1$ - for (String path : paths) { - IPath ooTypesPath = new Path (path); - oooTypesArgs += " -X\"" + ooTypesPath.toOSString() + "\""; //$NON-NLS-1$ //$NON-NLS-2$ - } - - String command = "cppumaker -T\"*\"" + //$NON-NLS-1$ - " -Gc -BUCR " + //$NON-NLS-1$ - "-O \"" + new File( pBuildFolder, INCLUDE ).getAbsolutePath() + //$NON-NLS-1$ - "\" \"" + //$NON-NLS-1$ - pTypesFile.getAbsolutePath() + "\" " + //$NON-NLS-1$ - oooTypesArgs; - - IUnoidlProject unoprj = ProjectsManager.getProject(pPrj.getName()); - Process process = pSdk.runTool(unoprj,command, pMonitor); - - LineNumberReader lineReader = new LineNumberReader( - new InputStreamReader(process.getErrorStream())); - - // Only for debugging purpose - if (PluginLogger.isLevel(LogLevels.DEBUG)) { - - String line = lineReader.readLine(); - while (null != line) { - System.out.println(line); - line = lineReader.readLine(); - } - } - - process.waitFor(); - - // Check if the build/include dir is in the includes - IPath includePath = pPrj.getFolder( - unoprj.getBuildPath().append( CppBuilder.INCLUDE ) ).getProjectRelativePath(); - - CDTHelper.addEntries( pPrj, - new CIncludePathEntry[]{ - new CIncludePathEntry( includePath, ICSettingEntry.VALUE_WORKSPACE_PATH ) }, - ICSettingEntry.INCLUDE_PATH ); - - } - } catch (InterruptedException e) { - PluginLogger.error( - Messages.getString("CppBuilder.CppumakerError"), e); //$NON-NLS-1$ - } catch (IOException e) { - PluginLogger.warning( - Messages.getString("CppBuilder.ErrorOutputUnreadable")); //$NON-NLS-1$ - } - } - } -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java b/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java deleted file mode 100644 index 20e69d7..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java +++ /dev/null @@ -1,296 +0,0 @@ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2009 by Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Cédric Bosdonnat. - * - * Copyright: 2009 by Novell, Inc. - * - * All Rights Reserved. - * - ************************************************************************/ -package org.openoffice.ide.eclipse.cpp; - -import java.util.ArrayList; -import java.util.HashMap; - -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.core.model.ISourceEntry; -import org.eclipse.cdt.core.settings.model.CIncludePathEntry; -import org.eclipse.cdt.core.settings.model.CLibraryPathEntry; -import org.eclipse.cdt.core.settings.model.CMacroEntry; -import org.eclipse.cdt.core.settings.model.CSourceEntry; -import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.core.settings.model.ICSourceEntry; -import org.eclipse.cdt.managedbuilder.core.IConfiguration; -import org.eclipse.cdt.managedbuilder.core.IManagedProject; -import org.eclipse.cdt.managedbuilder.core.IProjectType; -import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.openoffice.ide.eclipse.core.PluginLogger; -import org.openoffice.ide.eclipse.core.model.IUnoFactoryConstants; -import org.openoffice.ide.eclipse.core.model.IUnoidlProject; -import org.openoffice.ide.eclipse.core.model.ProjectsManager; -import org.openoffice.ide.eclipse.core.model.UnoFactoryData; -import org.openoffice.ide.eclipse.core.model.config.IOOo; -import org.openoffice.ide.eclipse.core.model.config.ISdk; -import org.openoffice.ide.eclipse.core.model.language.IProjectHandler; - -/** - * Helper class handling the C++ parts of UNO projects. - * - * @author cbosdonnat - * - */ -public class CppProjectHandler implements IProjectHandler { - - public static final String[] LIBS = { - "uno_sal", //$NON-NLS-1$ - "uno_cppu", //$NON-NLS-1$ - "uno_cppuhelpergcc3", //$NON-NLS-1$ - "uno_salhelpergcc3" //$NON-NLS-1$ - }; - - /** - * {@inheritDoc} - */ - public void addOOoDependencies(IOOo pOoo, IProject pProject) { - IUnoidlProject unoprj = ProjectsManager.getProject( pProject.getName() ); - addOOoDependencies( pOoo, unoprj.getSdk(), pProject ); - } - - /** - * {@inheritDoc} - */ - public void addProjectNature(IProject pProject) { - try { - CDTHelper.addCDTNature( pProject, null ); - PluginLogger.debug( Messages.getString("CppProjectHandler.NatureSet") ); //$NON-NLS-1$ - } catch (CoreException e) { - PluginLogger.error( Messages.getString("CppProjectHandler.NatureFailed") ); //$NON-NLS-1$ - } - } - - /** - * {@inheritDoc} - */ - public void configureProject(UnoFactoryData pData, IProgressMonitor pMonitor) throws Exception { - IProject prj = (IProject)pData.getProperty( - IUnoFactoryConstants.PROJECT_HANDLE); - - // I don't know why, but this is needed to avoid problems when saving the buildInfos - String srcDir = (String)pData.getProperty( IUnoFactoryConstants.PROJECT_SRC_DIR ); - IPath srcPath = prj.getFolder( srcDir ).getProjectRelativePath(); - ISourceEntry srcEntry = CoreModel.newSourceEntry( srcPath ); - ICProject cPrj = CoreModel.getDefault().getCModel().getCProject( prj.getName() ); - CoreModel.setRawPathEntries( cPrj, new IPathEntry[] { srcEntry }, null ); - - // Create the managed build configurations - IProjectType prjType = null; - ArrayList< IConfiguration > validConfigs = new ArrayList<IConfiguration>(); - - IProjectType[] types = ManagedBuildManager.getDefinedProjectTypes(); - for (IProjectType type : types) { - boolean isSharedLib = type.getBuildArtefactType().getId().equals( - ManagedBuildManager.BUILD_ARTEFACT_TYPE_PROPERTY_SHAREDLIB ); - boolean isTest = type.isTestProjectType(); - boolean isSupported = type.isSupported(); - boolean isAbstract = type.isAbstract(); - - if ( isSharedLib && !isTest && isSupported && !isAbstract ) { - IConfiguration[] configs = type.getConfigurations(); - for (IConfiguration config : configs) { - if ( ManagedBuildManager.isPlatformOk( config.getToolChain() ) ) { - prjType = type; - validConfigs.add( config ); - } - } - } - } - - // Initialize the project - ManagedBuildManager.createBuildInfo( prj ); - IManagedProject managedPrj = ManagedBuildManager.createManagedProject( prj, prjType ); - ICSourceEntry sourceEntry = new CSourceEntry( prj.getFolder(srcPath).getProjectRelativePath(), null, 0 ); - - for ( IConfiguration config : validConfigs ) { - String newId = ManagedBuildManager.calculateChildId( config.getId(), null); - IConfiguration newConf = managedPrj.createConfiguration( config, newId ); - newConf.setArtifactName( prj.getName().replaceAll( " ", new String( ) ) ); //$NON-NLS-1$ - newConf.setName( config.getName() ); - newConf.setSourceEntries( new ICSourceEntry[] { sourceEntry } ); - newConf.setArtifactExtension( "uno." + newConf.getArtifactExtension() ); //$NON-NLS-1$ - } - - ManagedBuildManager.saveBuildInfo( prj, true ); - } - - /** - * {@inheritDoc} - */ - public IPath getImplementationFile(String pImplementationName) { - return new Path( pImplementationName + ".cxx" ); //$NON-NLS-1$ - } - - /** - * {@inheritDoc} - */ - public String getImplementationName(IUnoidlProject pPrj, String pService) throws Exception { - return pService.substring( pService.lastIndexOf( '.' ) + 1 ) + "Impl"; //$NON-NLS-1$ - } - - /** - * {@inheritDoc} - */ - public String getLibraryPath(IUnoidlProject pUnoprj) { - IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject( pUnoprj.getName() ); - - IConfiguration config = ManagedBuildManager.getBuildInfo( prj ).getSelectedConfiguration(); - IPath path = ManagedBuildManager.getBuildLocation( config, config.getBuilder() ); - return path.toFile().getAbsolutePath(); - } - - /** - * {@inheritDoc} - */ - public String getSkeletonMakerLanguage(UnoFactoryData pData) throws Exception { - return "--cpp"; //$NON-NLS-1$ - } - - /** - * {@inheritDoc} - */ - public void removeOOoDependencies(IOOo pOoo, IProject pProject) { - IUnoidlProject unoprj = ProjectsManager.getProject( pProject.getName() ); - removeOOoDependencies( pOoo, unoprj.getSdk(), pProject ); - } - - /** - * {@inheritDoc} - */ - public IFolder[] getBinFolders(IUnoidlProject pUnoidlProject) { - // TODO Auto-generated method stub - return new IFolder[0]; - } - - /** - * Utility method providing the necessary macros to add depending on the OS. - * - * @param pOs the OS for which to get the macros - * - * @return the list of macros to set - */ - private static ICLanguageSettingEntry[] getMacrosForPlatform( String pOs ) { - - HashMap<String, String> macrosList = new HashMap<String, String>(); - macrosList.put( Platform.OS_LINUX, "UNX GCC LINUX CPPU_ENV=gcc3" ); //$NON-NLS-1$ - macrosList.put( Platform.OS_MACOSX, "UNX GCC MACOSX CPPU_ENV=gcc3" ); //$NON-NLS-1$ - macrosList.put( Platform.OS_SOLARIS, "UNX SOLARIS SPARC CPPU_ENV=sunpro5" ); //$NON-NLS-1$ - macrosList.put( Platform.OS_WIN32, "WIN32 WNT CPPU_ENV=msci" ); //$NON-NLS-1$ - - - ArrayList<ICLanguageSettingEntry> results = new ArrayList<ICLanguageSettingEntry>(); - String[] macros = macrosList.get( pOs ).split( " " ); //$NON-NLS-1$ - for (String macro : macros) { - String[] parts = macro.split( "=" ); //$NON-NLS-1$ - String name = parts[0]; - String value = null; - if ( parts.length > 1 ) { - value = parts[1]; - } - results.add( new CMacroEntry( name, value, 0 ) ); - } - - return results.toArray( new ICLanguageSettingEntry[ results.size() ]); - } - - /** - * Add the OOo C++ dependencies to a project. - * - * @param pOoo the OOo to configure with - * @param pSdk the OOo Sdk to configure with - * @param pProject the project to configure - */ - public static void addOOoDependencies(IOOo pOoo, ISdk pSdk, IProject pProject) { - CIncludePathEntry sdkIncludes = new CIncludePathEntry( pSdk.getIncludePath(), 0 ); - CIncludePathEntry includes = new CIncludePathEntry( OOoSdkProjectJob.getIncludes( pOoo ), 0 ); - - ArrayList< CLibraryPathEntry > libs = new ArrayList<CLibraryPathEntry>(); - String[] oooLibs = pOoo.getLibsPath(); - for (String libPath : oooLibs) { - libs.add( new CLibraryPathEntry( new Path( libPath ), 0 ) ); - } - IFolder oooSdkLibs = OOoSdkProjectJob.getLibraries( pOoo ); - libs.add( new CLibraryPathEntry( oooSdkLibs, ICSettingEntry.VALUE_WORKSPACE_PATH ) ); - - - CDTHelper.addEntries( pProject, - new CIncludePathEntry[] { sdkIncludes, includes }, ICSettingEntry.INCLUDE_PATH ); - CDTHelper.addEntries( pProject, - libs.toArray( new CLibraryPathEntry[libs.size()]), ICSettingEntry.LIBRARY_PATH ); - CDTHelper.addEntries( pProject, getMacrosForPlatform( Platform.getOS() ), ICSettingEntry.MACRO ); - CDTHelper.addLibs( pProject, LIBS ); - - // Run the cppumaker on the ooo types ( asynchronous ) - OOoSdkProjectJob job = new OOoSdkProjectJob(pOoo, pSdk ); - job.schedule(); - - CDTHelper.addEntries( pProject, new ICLanguageSettingEntry[]{ includes }, ICSettingEntry.INCLUDE_PATH ); - } - - /** - * Remove the OOo C++ dependencies to a project. - * - * @param pOoo the OOo to configure with - * @param pSdk the OOo Sdk to configure with - * @param pProject the project to configure - */ - public static void removeOOoDependencies(IOOo pOoo, ISdk pSdk, IProject pProject) { - CIncludePathEntry sdkIncludes = new CIncludePathEntry( pSdk.getIncludePath(), 0 ); - CIncludePathEntry includes = new CIncludePathEntry( OOoSdkProjectJob.getIncludes( pOoo ), 0 ); - - ArrayList< CLibraryPathEntry > libs = new ArrayList<CLibraryPathEntry>(); - String[] oooLibs = pOoo.getLibsPath(); - for (String libPath : oooLibs) { - libs.add( new CLibraryPathEntry( new Path( libPath ), 0 ) ); - } - IFolder oooSdkLibs = OOoSdkProjectJob.getLibraries( pOoo ); - libs.add( new CLibraryPathEntry( oooSdkLibs, ICSettingEntry.VALUE_WORKSPACE_PATH ) ); - - CDTHelper.removeEntries( pProject, - new CIncludePathEntry[] { sdkIncludes, includes }, ICSettingEntry.INCLUDE_PATH ); - CDTHelper.removeEntries( pProject, - libs.toArray( new CLibraryPathEntry[libs.size()]), ICSettingEntry.LIBRARY_PATH ); - CDTHelper.removeEntries( pProject, getMacrosForPlatform( Platform.getOS() ), ICSettingEntry.MACRO ); - CDTHelper.removeLibs( pProject, LIBS ); - } -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/Language.java b/cpp/source/org/openoffice/ide/eclipse/cpp/Language.java deleted file mode 100644 index 624c281..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/Language.java +++ /dev/null @@ -1,77 +0,0 @@ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2009 by Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Cédric Bosdonnat. - * - * Copyright: 2009 by Novell, Inc. - * - * All Rights Reserved. - * - ************************************************************************/ -package org.openoffice.ide.eclipse.cpp; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.debug.core.ILaunch; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import org.openoffice.ide.eclipse.core.model.IUnoidlProject; -import org.openoffice.ide.eclipse.core.model.language.AbstractLanguage; -import org.openoffice.ide.eclipse.core.model.language.ILanguageBuilder; -import org.openoffice.ide.eclipse.core.model.language.IProjectHandler; - -/** - * Class for the extension point. - * - * @author cbosdonnat - * - */ -public class Language extends AbstractLanguage { - - /** - * {@inheritDoc} - */ - public ILanguageBuilder getLanguageBuidler() { - return new CppBuilder(); - } - - /** - * {@inheritDoc} - */ - public IProjectHandler getProjectHandler() { - return new CppProjectHandler(); - } - - /** - * {@inheritDoc} - */ - public void connectDebuggerToOpenOffice(IUnoidlProject pPrj, ILaunch pLaunch, IPath pUserInstallation, - IProgressMonitor pMonitor) { - throw new RuntimeException("Not yet supported!"); - } - - @Override - public void configureSourceLocator(ILaunchConfigurationWorkingCopy pConfiguration) throws CoreException { - throw new RuntimeException("Not yet implemented!"); - }; -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/Messages.java b/cpp/source/org/openoffice/ide/eclipse/cpp/Messages.java deleted file mode 100644 index 56a4284..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/Messages.java +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2009 by Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Cédric Bosdonnat. - * - * Copyright: 2009 by Novell, Inc. - * - * All Rights Reserved. - * - ************************************************************************/ -package org.openoffice.ide.eclipse.cpp; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -/** - * Messages for the package. - * - * @author cbosdonnat - * - */ -public class Messages { - private static final String BUNDLE_NAME = "org.openoffice.ide.eclipse.cpp.messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - /** - * Default constructor. - */ - private Messages() { - } - - /** - * Get the string from it's key. - * - * @param pKey the key of the string - * - * @return the internationalized string - */ - public static String getString(String pKey) { - String string = '!' + pKey + '!'; - try { - string = RESOURCE_BUNDLE.getString(pKey); - } catch (MissingResourceException e) { - } - return string; - } -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/OOoSdkProjectJob.java b/cpp/source/org/openoffice/ide/eclipse/cpp/OOoSdkProjectJob.java deleted file mode 100644 index c589cf6..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/OOoSdkProjectJob.java +++ /dev/null @@ -1,270 +0,0 @@ -package org.openoffice.ide.eclipse.cpp; - -import java.io.File; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.text.MessageFormat; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.openoffice.ide.eclipse.core.LogLevels; -import org.openoffice.ide.eclipse.core.PluginLogger; -import org.openoffice.ide.eclipse.core.model.config.IOOo; -import org.openoffice.ide.eclipse.core.model.config.ISdk; - -/** - * Eclipse Job generating an OOo SDK project to use for the C++ UNO - * projects dependencies. - * - * This job also generates the headers from the UNO types defined in - * the OpenOffice.org instance. - * - * @author cbosdonnat - * - */ -public class OOoSdkProjectJob extends Job { - - private static final String INCLUDES_DIR = "includes"; //$NON-NLS-1$ - private static final String PRJ_NAME_PATTERN = "{0} Cpp SDK"; //$NON-NLS-1$ - private static final String LIBS_DIR = "libs"; //$NON-NLS-1$ - - private IOOo mOOo; - private ISdk mSdk; - - /** - * Constructor. - * - * @param pOOo the OOo for which to create the SDK project - * @param pSdk the OOo SDK for which to create the SDK project - */ - public OOoSdkProjectJob( IOOo pOOo, ISdk pSdk ) { - super( Messages.getString("OOoSdkProjectJob.Title") + pOOo.getName() ); //$NON-NLS-1$ - mOOo = pOOo; - mSdk = pSdk; - } - - /** - * Get the includes folder in the SDK project corresponding to the - * given OOo instance. - * - * @param pOOo the OOo instance for which to get the includes folder - * - * @return the include folder in the workspace. - */ - public static IFolder getIncludes( IOOo pOOo ) { - - String prjName = MessageFormat.format( PRJ_NAME_PATTERN, pOOo.getName() ); - IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject( prjName ); - - return prj.getFolder( INCLUDES_DIR ); - } - - /** - * Get the libraries folder in the SDK project corresponding to the - * given OOo instance. - * - * @param pOOo the OOo instance for which to get the libraries folder - * - * @return the libraries folder in the workspace. - */ - public static IFolder getLibraries( IOOo pOOo ) { - - String prjName = MessageFormat.format( PRJ_NAME_PATTERN, pOOo.getName() ); - IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject( prjName ); - - return prj.getFolder( LIBS_DIR ); - } - - @Override - protected IStatus run( IProgressMonitor pMonitor ) { - - IStatus status = new Status( IStatus.OK, Activator.PLUGIN_ID, - Messages.getString("OOoSdkProjectJob.OkStatus") ); //$NON-NLS-1$ - - try { - // Create the OOo SDK project - String prjName = MessageFormat.format( PRJ_NAME_PATTERN, mOOo.getName() ); - IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject( prjName ); - if ( !prj.exists() ) { - prj.create( pMonitor ); - } - - // Open the project if not opened - if (!prj.isOpen()) { - prj.open( pMonitor ); - PluginLogger.debug("Project opened"); //$NON-NLS-1$ - } - - // Link the URE libs here - createLibLinks( prj, pMonitor ); - - // Create the includes - createIncludes( prj, pMonitor ); - - } catch ( Exception e ) { - status = new Status( IStatus.ERROR, Activator.PLUGIN_ID, - Messages.getString("OOoSdkProjectJob.FailedStatus"), e ); //$NON-NLS-1$ - } - - return status; - } - - /** - * Utility method creating the links to the libraries in the SDK project. - * - * @param pPrj the project in which to create the links - * @param pMonitor a progress monitor - * - * @throws CoreException if anything wrong happens - */ - private void createLibLinks(IProject pPrj, IProgressMonitor pMonitor) throws CoreException { - - String os = Platform.getOS(); - if ( os.equals( Platform.OS_LINUX ) || os.equals( Platform.OS_SOLARIS ) - || os.equals( Platform.OS_MACOSX ) ) { - // Create the link folder - IFolder folder = pPrj.getFolder( LIBS_DIR ); - - if ( !folder.exists() ) { - folder.create( true, true, pMonitor ); - } - - String ext = "so"; //$NON-NLS-1$ - if ( os.equals( Platform.OS_MACOSX ) ) { - ext = "dylib"; //$NON-NLS-1$ - } - - String[] paths = mOOo.getLibsPath(); - for (String path : paths) { - Path dirPath = new Path( path ); - // Check for the libs to link - for ( String lib : CppProjectHandler.LIBS ) { - String pattern = "lib{0}.{1}"; //$NON-NLS-1$ - String libname = MessageFormat.format( pattern, lib, ext ); - String syslibname = libname + ".3"; //$NON-NLS-1$ - - File libFile = new File( dirPath.toFile(), syslibname ); - if ( libFile.exists() ) { - String orig = libFile.getAbsolutePath(); - - // Run ln to link the files: present on all *NIX platforms - doLink( orig, folder, libname ); - } - } - } - folder.refreshLocal( IResource.DEPTH_ONE, pMonitor ); - } - } - - /** - * Create the link for a library. - * - * @param pOrig the file to link from - * @param pFolder the folder where to create the link - * @param pLibname the name of the library in the new folder - */ - private void doLink( String pOrig, IFolder pFolder, String pLibname ) { - String dest = pFolder.getFile( pLibname ).getLocation().toOSString(); - String[] command = { - "ln", "-s", //$NON-NLS-1$ //$NON-NLS-2$ - pOrig, dest - }; - try { - Process proc = Runtime.getRuntime().exec( command ); - - StringBuffer buf = getErrorString( proc ); - if ( !buf.toString().trim().equals( new String( ) ) ) { - String msg = Messages.getString("OOoSdkProjectJob.LinkError") + //$NON-NLS-1$ - pLibname + "\n"; //$NON-NLS-1$ - msg += buf.toString(); - PluginLogger. error( msg ); - } - - proc.waitFor(); - - } catch ( Exception e ) { - PluginLogger.error( Messages.getString("OOoSdkProjectJob.LinkError") + //$NON-NLS-1$ - pLibname, e ); - } - } - - /** - * Utility method creating the headers in the SDK project. - * - * @param pProject the project in which to create the headers - * @param pMonitor a progress monitor - * - * @throws Exception if anything wrong happens - */ - private void createIncludes( IProject pProject, IProgressMonitor pMonitor) throws Exception { - // Create the destination folder if needed - IFolder folder = pProject.getFolder( INCLUDES_DIR ); - if ( !folder.exists() ) { - folder.create( true, true, pMonitor ); - } - - // Generate the include into the new project - String[] paths = mOOo.getTypesPath(); - String oooTypesArgs = ""; //$NON-NLS-1$ - for (String path : paths) { - IPath ooTypesPath = new Path (path); - oooTypesArgs += " \"" + ooTypesPath.toOSString() + "\""; //$NON-NLS-1$ //$NON-NLS-2$ - } - - String cmdPattern = "cppumaker -T\"*\" -Gc -BUCR -O \"{0}\" {1}"; //$NON-NLS-1$ - String command = MessageFormat.format( cmdPattern, - folder.getLocation().toFile().getAbsolutePath() , oooTypesArgs ); - Process process = mSdk.runToolWithEnv( pProject, mOOo, command, new String[0], pMonitor ); - - StringBuffer buf = getErrorString( process ); - if ( !buf.toString().trim().equals( new String( ) ) ) { - String msg = Messages.getString("OOoSdkProjectJob.IncludesError"); //$NON-NLS-1$ - msg += buf.toString(); - PluginLogger. error( msg ); - } - - process.waitFor(); - - // Refresh the folder - folder.refreshLocal( IResource.DEPTH_INFINITE, pMonitor ); - } - - /** - * Get the error string from the <code>cppumaker</code> process. - * - * @param pProcess the running process - * - * @return the error string buffer - */ - private StringBuffer getErrorString(Process pProcess) { - StringBuffer buf = new StringBuffer(); - - LineNumberReader lineReader = new LineNumberReader( - new InputStreamReader(pProcess.getErrorStream())); - - try { - // Only for debugging purpose - if (PluginLogger.isLevel(LogLevels.DEBUG)) { - String line = lineReader.readLine(); - while (null != line) { - buf.append( line + "\n" ); //$NON-NLS-1$ - line = lineReader.readLine(); - } - } - } catch ( Exception e ) { - // Not reporting errors in error reader - } - return buf; - } - -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/client/ClientWizard.java b/cpp/source/org/openoffice/ide/eclipse/cpp/client/ClientWizard.java deleted file mode 100644 index 7196035..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/client/ClientWizard.java +++ /dev/null @@ -1,164 +0,0 @@ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2009 by Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Cédric Bosdonnat. - * - * Copyright: 2009 by Novell, Inc. - * - * All Rights Reserved. - * - ************************************************************************/ -package org.openoffice.ide.eclipse.cpp.client; -import java.io.File; -import java.io.FileWriter; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.text.MessageFormat; - -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.IPathEntry; -import org.eclipse.cdt.ui.wizards.CCProjectWizard; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResource; -import org.eclipse.ui.IWorkbenchPage; -import org.openoffice.ide.eclipse.core.PluginLogger; -import org.openoffice.ide.eclipse.core.model.config.IOOo; -import org.openoffice.ide.eclipse.core.model.config.ISdk; -import org.openoffice.ide.eclipse.core.utils.WorkbenchHelper; -import org.openoffice.ide.eclipse.cpp.Activator; -import org.openoffice.ide.eclipse.cpp.CppProjectHandler; - -/** - * Class for the C++ UNO Client wizard. - * - * @author cbosdonnat - * - */ -public class ClientWizard extends CCProjectWizard { - - private static final String SRC_DIR_NAME = "src"; //$NON-NLS-1$ - private static final String CLIENT_FILE = "client.cxx"; //$NON-NLS-1$ - - private UnoConnectionPage mCnxPage; - private IWorkbenchPage mActivePage; - - /** - * Default constructor. - */ - public ClientWizard() { - super( ); - setWindowTitle( Messages.getString("ClientWizard.Title") ); //$NON-NLS-1$ - mActivePage = WorkbenchHelper.getActivePage(); - } - - @Override - public void addPages() { - mCnxPage = new UnoConnectionPage(); - UnoClientWizardPage mainPage = new UnoClientWizardPage( "cdtmain", mCnxPage ); //$NON-NLS-1$ - fMainPage = mainPage; - fMainPage.setTitle( getWindowTitle() ); - fMainPage.setDescription( Messages.getString("ClientWizard.Description") ); //$NON-NLS-1$ - fMainPage.setImageDescriptor( Activator.imageDescriptorFromPlugin( Activator.PLUGIN_ID, - Messages.getString("ClientWizard.ClientWizardBanner") ) ); //$NON-NLS-1$ - - addPage(fMainPage); - - mCnxPage.setMainPage( mainPage ); - addPage( mCnxPage ); - - } - - @Override - public boolean performFinish() { - boolean finished = super.performFinish(); - - try { - IOOo ooo = mCnxPage.getOoo(); - ISdk sdk = mCnxPage.getSdk(); - - // Copy the helper files in the helper source dir - IFolder srcDir = newProject.getFolder( SRC_DIR_NAME ); - srcDir.create( true, true, null ); - - copyResource( "connection.hxx", srcDir, new String() ); //$NON-NLS-1$ - copyResource( "connection.cxx", srcDir, new String() ); //$NON-NLS-1$ - - String cnxInitCode = mCnxPage.getConnectionCode(); - copyResource( CLIENT_FILE, srcDir, cnxInitCode ); - - srcDir.refreshLocal( IResource.DEPTH_ONE, null ); - - // Add the helper dir to the source path entries - ICProject cprj = CoreModel.getDefault().getCModel().getCProject( newProject.getName() ); - IPathEntry[] entries = CoreModel.getRawPathEntries( cprj ); - IPathEntry[] newEntries = new IPathEntry[ entries.length + 1 ]; - System.arraycopy( entries, 0, newEntries, 0, entries.length ); - newEntries[ newEntries.length - 1 ] = CoreModel.newSourceEntry( srcDir.getFullPath() ); - CoreModel.setRawPathEntries( cprj, newEntries, null ); - - CppProjectHandler.addOOoDependencies( ooo, sdk, newProject ); - - selectAndReveal( srcDir.getFile( CLIENT_FILE ) ); - WorkbenchHelper.showFile( srcDir.getFile( CLIENT_FILE ), mActivePage ); - - } catch ( Exception e ) { - PluginLogger.error( Messages.getString("ClientWizard.ClientConfigError"), e ); //$NON-NLS-1$ - } - - return finished; - } - - /** - * Copy a template resource into the generated project. - * - * @param pResName the name of the file to copy - * @param pSrcDir the folder where to put it - * @param pReplacement the replacement value for the connection string - */ - private void copyResource(String pResName, IContainer pSrcDir, String pReplacement ) { - InputStream in = this.getClass().getResourceAsStream( pResName ); - File destFile = new File( pSrcDir.getLocation().toFile(), pResName ); - - FileWriter out = null; - try { - - LineNumberReader reader = new LineNumberReader( new InputStreamReader( in ) ); - out = new FileWriter( destFile ); - - String line = reader.readLine(); - while ( line != null ) { - out.append( MessageFormat.format( line, pReplacement ) + "\n" ); //$NON-NLS-1$ - line = reader.readLine(); - } - - } catch ( Exception e ) { - - } finally { - try { in.close(); } catch ( Exception e ) { } - try { out.close(); } catch ( Exception e ) { } - } - } -}
\ No newline at end of file diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/client/Messages.java b/cpp/source/org/openoffice/ide/eclipse/cpp/client/Messages.java deleted file mode 100644 index d8b9933..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/client/Messages.java +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2009 by Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Cédric Bosdonnat. - * - * Copyright: 2009 by Novell, Inc. - * - * All Rights Reserved. - * - ************************************************************************/ -package org.openoffice.ide.eclipse.cpp.client; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -/** - * Messages for the package. - * - * @author cbosdonnat - * - */ -public class Messages { - private static final String BUNDLE_NAME = "org.openoffice.ide.eclipse.cpp.client.messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - /** - * Default constructor. - */ - private Messages() { - } - - /** - * Get the string from it's key. - * - * @param pKey the key of the string - * - * @return the internationalized string - */ - public static String getString(String pKey) { - String string = '!' + pKey + '!'; - try { - string = RESOURCE_BUNDLE.getString(pKey); - } catch (MissingResourceException e) { - } - return string; - } -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/client/UnoClientWizardPage.java b/cpp/source/org/openoffice/ide/eclipse/cpp/client/UnoClientWizardPage.java deleted file mode 100644 index 8171f1b..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/client/UnoClientWizardPage.java +++ /dev/null @@ -1,107 +0,0 @@ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2009 by Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Cédric Bosdonnat. - * - * Copyright: 2009 by Novell, Inc. - * - * All Rights Reserved. - * - ************************************************************************/ -package org.openoffice.ide.eclipse.cpp.client; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; -import org.eclipse.cdt.ui.wizards.CDTMainWizardPage; -import org.eclipse.cdt.ui.wizards.EntryDescriptor; -import org.eclipse.jface.wizard.IWizardPage; - -/** - * Class for the main UNO client wizard page. - * - * This page is derived from the CDT class, but some restrictions are - * applied to the selectable projects to fit the UNO Client case. - * - * @author cbosdonnat - * - */ -public class UnoClientWizardPage extends CDTMainWizardPage { - - private UnoConnectionPage mUnoCnxPage; - - /** - * Creates a new project creation wizard page. - * - * @param pPageName the name of this page - * @param pUnoPage the page for the UNO connection config - */ - public UnoClientWizardPage(String pPageName, UnoConnectionPage pUnoPage ) { - super(pPageName); - mUnoCnxPage = pUnoPage; - setPageComplete(false); - } - - /** - * Only show the executable project types here. - * - * @param pItems the items to filter. - * @return the items to show - */ - @SuppressWarnings("unchecked") - @Override - public List filterItems(List pItems) { - ArrayList filtered = new ArrayList(); - - for (Object item : pItems) { - EntryDescriptor desc = (EntryDescriptor)item; - String parentId = desc.getParentId(); - boolean exeParent = parentId != null && - parentId.equals( ManagedBuildManager.BUILD_ARTEFACT_TYPE_PROPERTY_EXE ); - boolean exe = desc.getId().equals( ManagedBuildManager.BUILD_ARTEFACT_TYPE_PROPERTY_EXE ); - - boolean kept = exeParent || exe; - if ( kept ) { - filtered.add( item ); - } - } - - return filtered; - } - - /** - * @return the Uno connection page, instead of the normal CDT next page. - */ - @Override - public IWizardPage getNextPage() { - return mUnoCnxPage; - } - - /** - * @return the normal CDT next page - */ - public IWizardPage getNextCdtPage( ) { - return super.getNextPage(); - } -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/client/UnoConnectionPage.java b/cpp/source/org/openoffice/ide/eclipse/cpp/client/UnoConnectionPage.java deleted file mode 100644 index 210e648..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/client/UnoConnectionPage.java +++ /dev/null @@ -1,71 +0,0 @@ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * the GNU Lesser General Public License Version 2.1 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2009 by Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * The Initial Developer of the Original Code is: Cédric Bosdonnat. - * - * Copyright: 2009 by Novell, Inc. - * - * All Rights Reserved. - * - ************************************************************************/ -package org.openoffice.ide.eclipse.cpp.client; - -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.swt.widgets.Composite; -import org.openoffice.ide.eclipse.core.wizards.pages.BaseUnoConnectionPage; - -/** - * Wizard page for the UNO Client configuration. - * - * @author cbosdonnat - * - */ -public class UnoConnectionPage extends BaseUnoConnectionPage { - - private static final String PIPE_PATTERN = "PipeConnection cnx( \"{0}\" );"; //$NON-NLS-1$ - private static final String SOCKET_PATTERN = "SocketConnection cnx( {1}, \"{0}\" );"; //$NON-NLS-1$ - - private UnoClientWizardPage mMainPage; - - @Override - public void createControl(Composite pParent) { - - super.createControl( pParent ); - setConnectionPatterns( PIPE_PATTERN, SOCKET_PATTERN ); - } - - /** - * @return the normal next page of the CDT main page. - */ - @Override - public IWizardPage getNextPage() { - return mMainPage.getNextCdtPage(); - } - - /** - * @param pMainPage the main configuration page of the UNO Client Wizard - */ - public void setMainPage(UnoClientWizardPage pMainPage) { - mMainPage = pMainPage; - } -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/client/client.cxx b/cpp/source/org/openoffice/ide/eclipse/cpp/client/client.cxx deleted file mode 100644 index 7bde5a0..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/client/client.cxx +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file has been automatically generated by the ooeclipse integration. - * http://cedric.bosdonnat.free.fr/ooeclipseintegration - * - * Copyright (C) 2009 Novell Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * http://www.gnu.org/copyleft/lesser.html - */ -#include <iostream> - -#include "connection.hxx" - -using namespace unoclienthelper; -using namespace com::sun::star::uno; - -int main( int argc, char** argv ) -'{' - int bRet = 1; - - {0} - if ( cnx.connect() ) - '{' - Reference< XComponentContext > xCtx = cnx.getContext(); - - // TODO Use the UNO Context here - - cnx.disconnect(); - bRet = 0; - } - - return bRet; -} diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/client/connection.cxx b/cpp/source/org/openoffice/ide/eclipse/cpp/client/connection.cxx deleted file mode 100644 index 5729fce..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/client/connection.cxx +++ /dev/null @@ -1,205 +0,0 @@ -/* - * This file has been automatically generated by the ooeclipse integration. - * http://cedric.bosdonnat.free.fr/ooeclipseintegration - * - * Ported by Cedric Bosdonnat from the JODConverter code. - * The original Java code has been written by Mirko Nasato <mirko@artofsolving.com> - * - * Copyright (C) 2009 Novell Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * http://www.gnu.org/copyleft/lesser.html - * - * Contributor: - * Mirko Nasato <mirko@artofsolving.com> - * Laurent Godard <lgodard@nuxeo.com> - */ - -#include <iostream> - -#include <rtl/bootstrap.hxx> -#include <cppuhelper/bootstrap.hxx> - -#include <com/sun/star/connection/XConnector.hpp> -#include <com/sun/star/connection/XConnection.hpp> -#include <com/sun/star/connection/NoConnectException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/bridge/XBridgeFactory.hpp> -#include <com/sun/star/bridge/XUnoUrlResolver.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> - -#include "connection.hxx" - -using namespace com::sun::star::frame; -using namespace com::sun::star::connection; -using namespace com::sun::star::beans; -using namespace com::sun::star::bridge; -using namespace com::sun::star::lang; -using namespace com::sun::star::uno; -using namespace com::sun::star; - -#define OUSTRING_TO_C( x ) rtl::OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr( ) - -namespace unoclienthelper '{' - -SocketConnection::SocketConnection( int nPort, char* pHost ) -'{' - rtl::OUString sCnxString = rtl::OUString::createFromAscii( "socket,host=" ); - sCnxString = sCnxString.concat( rtl::OUString::createFromAscii( pHost ) ); - sCnxString = sCnxString.concat( rtl::OUString::createFromAscii( ",port=" ) ); - m_sConnectionString = sCnxString.concat( rtl::OUString::valueOf( sal_Int32( nPort ) ) ); -} - -SocketConnection::~SocketConnection() -'{' -} - -PipeConnection::PipeConnection( char* pPipeName ) -'{' - rtl::OUString sCnxString = rtl::OUString::createFromAscii( "pipe,name=" ); - m_sConnectionString = sCnxString.concat( rtl::OUString::createFromAscii( pPipeName ) ); -} - -PipeConnection::~PipeConnection() -'{' -} - -AbstractConnection::AbstractConnection() : - m_bExpectingDisconnect( false ), - m_bConnected ( false ) -'{' -} - -AbstractConnection::~AbstractConnection() -'{' -} - -bool AbstractConnection::connect( ) -'{' - // Try to connect - try - '{' - Reference< XComponentContext > xCtx = cppu::defaultBootstrap_InitialComponentContext(); - Reference< XMultiServiceFactory > xServiceFactory ( xCtx->getServiceManager(), UNO_QUERY ); - - // Get a connection - Reference< XConnector> xConnector ( xServiceFactory->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.connection.Connector" ) ), UNO_QUERY ); - Reference< XConnection > xConnection = xConnector->connect( m_sConnectionString ); - - // Get a Bridge - Reference< XBridgeFactory > xBridgeFactory( xServiceFactory->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.bridge.BridgeFactory" ) ), UNO_QUERY ); - m_xBridge = xBridgeFactory->createBridge( rtl::OUString( ), rtl::OUString::createFromAscii( "urp" ), - xConnection, NULL ); - - // Register a listener on the bridge - Reference< XComponent > xBridgeComponent( m_xBridge, UNO_QUERY ); - xBridgeComponent->addEventListener( this ); - - // Get the Remote service manager - Reference< XMultiComponentFactory > xServiceMngr( - m_xBridge->getInstance( rtl::OUString::createFromAscii( "StarOffice.ServiceManager" ) ), - UNO_QUERY ); - m_xServiceMngr = xServiceMngr; - - // Get the remote default context - Reference<XPropertySet> xPropSet( m_xServiceMngr, UNO_QUERY ); - Reference<XComponentContext> xRemoteCtxt( - xPropSet->getPropertyValue( rtl::OUString::createFromAscii( "DefaultContext" ) ), - UNO_QUERY ); - m_xCtx = xRemoteCtxt; - -#if DEBUG - fprintf( stderr, "Connected\n" ); -#endif - - m_bConnected = true; - } - catch ( NoConnectException e ) - '{' -#if DEBUG - fprintf( stderr, "connection failed: %s : %s\n", - OUSTRING_TO_C( m_sConnectionString ), - OUSTRING_TO_C( e.Message ) ); -#endif - m_bConnected = false; - } - return m_bConnected; -} - -void AbstractConnection::disconnect() -'{' - m_bExpectingDisconnect = true; - Reference< XComponent > xBridgeComponent( m_xBridge, UNO_QUERY ); - xBridgeComponent->dispose( ); -} - -bool AbstractConnection::isConnected( ) -'{' - return m_bConnected; -} - -Reference<XComponentContext> AbstractConnection::getContext( ) -'{' - return m_xCtx; -} - -Reference<XMultiComponentFactory> AbstractConnection::getServiceManager( ) -'{' - return m_xServiceMngr; -} - -Reference<XDesktop> AbstractConnection::getDesktop() -'{' - Reference<XDesktop> xDesktop( - getService( rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), - UNO_QUERY ); - return xDesktop; -} - -Reference<XInterface> AbstractConnection::getService( rtl::OUString sServiceName ) -'{' - Reference< XInterface > xIface; - - bool bManagedConnection = true; - if ( !m_bConnected ) - '{' -#if DEBUG - fprintf( stderr, "Trying to (re)connect\n" ); -#endif - bManagedConnection = connect(); - } - - if ( bManagedConnection ) - xIface = m_xServiceMngr->createInstanceWithContext( sServiceName, m_xCtx ); - - return xIface; -} - -void AbstractConnection::disposing( const EventObject& source ) throw ( RuntimeException ) -'{' - m_bConnected = false; -#if DEBUG - if ( m_bExpectingDisconnect ) - '{' - fprintf( stderr, "Disconnected\n" ); - } - else - '{' - fprintf( stderr, "Disconnected unexpectedly\n" ); - } -#endif - m_bExpectingDisconnect = false; -} - -} // End of namespace unoclienthelper diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/client/connection.hxx b/cpp/source/org/openoffice/ide/eclipse/cpp/client/connection.hxx deleted file mode 100644 index a93eccd..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/client/connection.hxx +++ /dev/null @@ -1,89 +0,0 @@ -/* - * This file has been automatically generated by the ooeclipse integration. - * http://cedric.bosdonnat.free.fr/ooeclipseintegration - * - * Ported by Cedric Bosdonnat from the JODConverter code. - * The original Java code has been written by Mirko Nasato <mirko@artofsolving.com> - * - * Copyright (C) 2009 Novell Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * http://www.gnu.org/copyleft/lesser.html - * - * Contributor: - * Mirko Nasato <mirko@artofsolving.com> - * Laurent Godard <lgodard@nuxeo.com> - */ - -#ifndef CONNECTION_HXX_ -#define CONNECTION_HXX_ - -#include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/bridge/XBridge.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/lang/XEventListener.hpp> -#include <cppuhelper/implbase1.hxx> - -#include <rtl/ustring.hxx> - - -namespace unoclienthelper '{' - -class AbstractConnection : public cppu::WeakImplHelper1< com::sun::star::lang::XEventListener > -'{' -private: - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> m_xCtx; - com::sun::star::uno::Reference<com::sun::star::bridge::XBridge> m_xBridge; - com::sun::star::uno::Reference<com::sun::star::lang::XMultiComponentFactory> m_xServiceMngr; - - bool m_bExpectingDisconnect; - bool m_bConnected; - -protected: - rtl::OUString m_sConnectionString; - -public: - AbstractConnection( ); - ~AbstractConnection( ); - - bool connect( ); - void disconnect( ); - bool isConnected( ); - - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> getContext( ); - com::sun::star::uno::Reference<com::sun::star::lang::XMultiComponentFactory> getServiceManager( ); - com::sun::star::uno::Reference<com::sun::star::frame::XDesktop> getDesktop( ); - - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); - -private: - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> getService( rtl::OUString sServiceName ); -}; - -class PipeConnection : public AbstractConnection -'{' -public: - PipeConnection( char* pPipeName ); - ~PipeConnection( ); -}; - -class SocketConnection : public AbstractConnection -'{' -public: - SocketConnection( int nPort, char* pHost = "localhost" ); - ~SocketConnection( ); -}; - -} // End of namespace unoclienthelper - -#endif /* CONNECTION_HXX_ */ diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/client/messages.properties b/cpp/source/org/openoffice/ide/eclipse/cpp/client/messages.properties deleted file mode 100644 index b0c4257..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/client/messages.properties +++ /dev/null @@ -1,4 +0,0 @@ -ClientWizard.ClientConfigError=Couldn't set OOo Client config -ClientWizard.ClientWizardBanner=icons/uno_client_wiz.png -ClientWizard.Description=Create the UNO C++ client application project -ClientWizard.Title=UNO Client C++ project diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/messages.properties b/cpp/source/org/openoffice/ide/eclipse/cpp/messages.properties deleted file mode 100644 index 043d6bd..0000000 --- a/cpp/source/org/openoffice/ide/eclipse/cpp/messages.properties +++ /dev/null @@ -1,11 +0,0 @@ -CDTHelper.LinkerOptionsError=Error setting linker libraries option -CDTHelper.PathEntryError=Error setting a path entry -CppBuilder.CppumakerError=cppumaker code generation failed -CppBuilder.ErrorOutputUnreadable=Unreadable output error -CppProjectHandler.NatureFailed=Failed to set C++ project nature -CppProjectHandler.NatureSet=C++ project nature set -OOoSdkProjectJob.FailedStatus=Failed to generate the includes -OOoSdkProjectJob.IncludesError=Error generating the includes\n -OOoSdkProjectJob.LinkError=Cannot link library -OOoSdkProjectJob.OkStatus=UNO includes generated -OOoSdkProjectJob.Title=Generating the OOo includes project for |
