diff --git a/.autotools b/.autotools deleted file mode 100644 index 2c31cd8f7c14..000000000000 --- a/.autotools +++ /dev/null @@ -1,42 +0,0 @@ - - - - - diff --git a/.cproject b/.cproject deleted file mode 100644 index f7b987ad4ea2..000000000000 --- a/.cproject +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - make - -j8 - all - true - false - true - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index 2e3b3f7f44d1..e6d9cf23ebd0 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,12 @@ configure po/POTFILES stamp-h1 +# Eclipse +.autotools +.cproject +.project +.settings/ + # PPA Build (ubuntu) ppa-build diff --git a/.project b/.project deleted file mode 100644 index 60f8066f65d0..000000000000 --- a/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - xournalpp - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/.settings/.gitignore b/.settings/.gitignore deleted file mode 100644 index d81d4c414cc2..000000000000 --- a/.settings/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/language.settings.xml diff --git a/.settings/org.eclipse.cdt.codan.core.prefs b/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index 9f6e81f577fb..000000000000 --- a/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,76 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return\\")",implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused return value\\")"} -org.eclipse.cdt.codan.checkers.nocommentinside=-Error -org.eclipse.cdt.codan.checkers.nocommentinside.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Nesting comments\\")"} -org.eclipse.cdt.codan.checkers.nolinecomment=-Error -org.eclipse.cdt.codan.checkers.nolinecomment.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Line comments\\")"} -org.eclipse.cdt.codan.checkers.noreturn=Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return value\\")",implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Abstract class cannot be instantiated\\")"} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Ambiguous problem\\")"} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment in condition\\")"} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment to itself\\")"} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No break at end of case\\")",no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false,enable_fallthrough_quickfix_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Catching by reference is recommended\\")",unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Circular inheritance\\")"} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class members should be properly initialized\\")",skip\=>true} -org.eclipse.cdt.codan.internal.checkers.DecltypeAutoProblem=Error -org.eclipse.cdt.codan.internal.checkers.DecltypeAutoProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid 'decltype(auto)' specifier\\")"} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Field cannot be resolved\\")"} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Function cannot be resolved\\")"} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid arguments\\")"} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid template argument\\")"} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Label statement not found\\")"} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Member declaration not found\\")"} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Method cannot be resolved\\")"} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Name convention for function\\")",pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class has a virtual method and non-virtual destructor\\")"} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid overload\\")"} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redeclaration\\")"} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redefinition\\")"} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Return with parenthesis\\")"} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Format String Vulnerability\\")"} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Statement has no effect\\")",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suggested parenthesis around expression\\")",paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suspicious semicolon\\")",else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Type cannot be resolved\\")"} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused function declaration\\")",macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused static function\\")",macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused variable declaration in file scope\\")",macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Symbol is not resolved\\")"} -org.eclipse.cdt.qt.core.qtproblem=Warning -org.eclipse.cdt.qt.core.qtproblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>true,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>null} -useParentScope=false diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs deleted file mode 100644 index 69c528037406..000000000000 --- a/.settings/org.eclipse.cdt.core.prefs +++ /dev/null @@ -1,164 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.cdt.core.formatter.alignment_for_assignment=16 -org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=80 -org.eclipse.cdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.cdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.cdt.core.formatter.alignment_for_conditional_expression=34 -org.eclipse.cdt.core.formatter.alignment_for_conditional_expression_chain=18 -org.eclipse.cdt.core.formatter.alignment_for_constructor_initializer_list=0 -org.eclipse.cdt.core.formatter.alignment_for_declarator_list=16 -org.eclipse.cdt.core.formatter.alignment_for_enumerator_list=48 -org.eclipse.cdt.core.formatter.alignment_for_expression_list=0 -org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.cdt.core.formatter.alignment_for_member_access=0 -org.eclipse.cdt.core.formatter.alignment_for_overloaded_left_shift_chain=16 -org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.cdt.core.formatter.brace_position_for_array_initializer=next_line -org.eclipse.cdt.core.formatter.brace_position_for_block=next_line -org.eclipse.cdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.cdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration=next_line -org.eclipse.cdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.cdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.cdt.core.formatter.comment.line_up_line_comment_in_blocks_on_first_column=false -org.eclipse.cdt.core.formatter.comment.min_distance_between_code_and_line_comment=1 -org.eclipse.cdt.core.formatter.comment.never_indent_line_comments_on_first_column=true -org.eclipse.cdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true -org.eclipse.cdt.core.formatter.compact_else_if=true -org.eclipse.cdt.core.formatter.continuation_indentation=2 -org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header=false -org.eclipse.cdt.core.formatter.indent_access_specifier_extra_spaces=0 -org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier=true -org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header=false -org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header=false -org.eclipse.cdt.core.formatter.indent_empty_lines=false -org.eclipse.cdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.cdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.cdt.core.formatter.indentation.size=4 -org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration=do not insert -org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.cdt.core.formatter.insert_new_line_before_colon_in_constructor_initializer_list=insert -org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration=do not insert -org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement=insert -org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.cdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments=insert -org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters=insert -org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause=insert -org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types=insert -org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list=insert -org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list=insert -org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments=insert -org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters=insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_exception_specification=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.cdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.cdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_exception_specification=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_exception_specification=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.cdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.cdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets=do not insert -org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_exception_specification=do not insert -org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.cdt.core.formatter.join_wrapped_lines=true -org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.cdt.core.formatter.lineSplit=120 -org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.cdt.core.formatter.tabulation.char=tab -org.eclipse.cdt.core.formatter.tabulation.size=4 -org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations=false diff --git a/.settings/org.eclipse.cdt.ui.prefs b/.settings/org.eclipse.cdt.ui.prefs deleted file mode 100644 index 4ee396b49dbe..000000000000 --- a/.settings/org.eclipse.cdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -formatter_profile=_Xournalpp -formatter_settings_version=1 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 730a9eb142f9..000000000000 --- a/.travis.yml +++ /dev/null @@ -1,61 +0,0 @@ -language: -- c -- cpp - -# clang is not supported for poppler -compiler: gcc - -cache: -- ccache - -os: linux -dist: xenial - -sudo: false - -env: - global: - # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created - # via the "travis encrypt" command using the project repo's public key - - secure: "gbpO001CnG6qPdcDr3t9SYL/C9DnxJZBeaAt+jKrd7SJ3Db0cKfVJRs9BTVrpznuoMNpb3T8R6gludUGNgxn2OkASHrlPBoK6xp4Npo4LVfbA6LVQsXr7znQnBueOQ//5WUhYoKGrbaeuxGAAcCxVNnCwmwp+nACPMobYUcGvlXc0Qx3Ao1PTKnk0lYCnkWlHxBcSZoUDjOCmanEvavNxapq29bnouO6EWEpu1tp0UngG0rA6irMOcSMmg7GtxJpk0uJ4JQm0GHWI2swU5VptKdS3cJ1o04+l9sfvElv2ekgNKlp1tqsJJpzg6VHwtt5kOkfzD8MfV0CY6084LEGAKz92uIHFdDI9jOlGJ0idjQyumWV59yVXw0a6visBzHzwEKxh4OgMS2GIdIfkzD1ipDz0Oq6bPaW6ueJ8fkQIaenwGqSiCyyfA9ULyqz/erSrV6rYBtBcgmer661RmVeEfZoa6O5TETEzRIMowJnOuU9PTrkoPmsSyfTXloeWpD3gkk7+2W7mLm/HXlKV1NJnT3fnq3lmgEmd2yoGB49aWTa3cf0xa0lnXlHqXAAmdvduebKN10byf3wcaDkb5ZzcF7iWYqYtUgiWGDX2lnN7kSFtjfF2+MkpfDQrKQyzxeIIzyjxFQ05ooZwcTW0R6X3EKGtwH8nUxSoMIsVUEGpGM=" - -addons: - apt: - packages: - - cmake - - - libcppunit-dev - - - libgtk-3-dev - - libpoppler-glib-dev - - portaudio19-dev - - libsndfile-dev - - liblua5.3-dev - - libzip-dev - - coverity_scan: - project: - name: "xournalpp/xournalpp" - description: "Notetaking software designed around a tablet." - notification_email: peter_klausing@wh2.tu-dresden.de - build_command_prepend: "cmake .. -DENABLE_CPPUNIT=ON" - build_command: "make" - branch_pattern: coverity_scan - -before_script: - - "mkdir build" - - "cd build" - -script: - - "cmake .. -DCMAKE_DEBUG_INCLUDES_LDFLAGS=ON -DENABLE_CPPUNIT=ON -DDEBUG_COMPILE=ON" - - "make -j `grep processor /proc/cpuinfo | tail -c 2`" - - "ctest" - -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/4879506130dac18d2f63 - on_success: change # options: [always|never|change] default: always - on_failure: always # options: [always|never|change] default: always - on_start: never # options: [always|never|change] default: always - diff --git a/azure-pipelines/CI.yml b/azure-pipelines/continuous-integration.yml similarity index 97% rename from azure-pipelines/CI.yml rename to azure-pipelines/continuous-integration.yml index 8963a4a0564e..57a162451681 100644 --- a/azure-pipelines/CI.yml +++ b/azure-pipelines/continuous-integration.yml @@ -57,7 +57,7 @@ stages: vmImage: 'macOS-10.13' displayName: 'Test Xournal++ on MacOS' steps: - - template: steps/build_mac_native.yml + - template: steps/build_mac.yml parameters: build_type: 'Debug' cmake_flags: '-DCMAKE_DEBUG_INCLUDES_LDFLAGS=ON -DENABLE_CPPUNIT=ON -DDEBUG_COMPILE=ON' diff --git a/azure-pipelines/dependencies/debian-dockerfile b/azure-pipelines/dependencies/debian-dockerfile new file mode 100644 index 000000000000..bc51259b1ff7 --- /dev/null +++ b/azure-pipelines/dependencies/debian-dockerfile @@ -0,0 +1,8 @@ +#Download base image latest debian +FROM debian:latest + +# Update Software repository +RUN apt-get update + +RUN apt-get install -y sudo && \ +rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/azure-pipelines/util/mingw-blob.yml b/azure-pipelines/dependencies/msys2-blob.yml similarity index 100% rename from azure-pipelines/util/mingw-blob.yml rename to azure-pipelines/dependencies/msys2-blob.yml diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml index 33b2cfa46929..724a06b86a4b 100644 --- a/azure-pipelines/release.yml +++ b/azure-pipelines/release.yml @@ -118,7 +118,7 @@ stages: displayName: 'Build for macOS' condition: always() steps: - - template: steps/build_mac_native.yml + - template: steps/build_mac.yml parameters: build_type: 'RelWithDebInfo' cmake_flags: '' diff --git a/azure-pipelines/steps/build_mac.yml b/azure-pipelines/steps/build_mac.yml index 0c899390e6c6..d63ebe959492 100644 --- a/azure-pipelines/steps/build_mac.yml +++ b/azure-pipelines/steps/build_mac.yml @@ -4,18 +4,35 @@ parameters: steps: - bash: | - brew update - brew upgrade - brew install cmake ninja pkg-config gtk+3 gtk-mac-integration poppler librsvg adwaita-icon-theme portaudio libsndfile lua libzip cppunit gettext - brew link --force gettext - displayName: 'Install dependencies' + ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall)" + displayName: 'Uninstall brew' + - bash: | + cd /Users + sudo mkdir git-bin + sudo chown $USER git-bin + cd git-bin + curl -L -o gtk-bin.tar.gz https://github.com/xournalpp/xournalpp-pipeline-dependencies/raw/master/gtk/mac/10.13/gtk-bin.tar.gz + tar -xzf gtk-bin.tar.gz + displayName: 'Unpack GTK' + - bash: | + curl -L -o libxml.tar.gz https://github.com/xournalpp/xournalpp-pipeline-dependencies/raw/master/libxml/mac/10.13/libxml.tar.gz + sudo tar -xzf libxml.tar.gz -C / + displayName: 'Unpack libxml' - bash: | mkdir build - displayName: 'Create build directory' + displayName: 'Create Build Directory' + - bash: | + curl -L -o ninja-mac.zip $(curl -s https://api.github.com/repos/ninja-build/ninja/releases/latest | grep "browser_download_url.*mac\.zip" | cut -d : -f 2,3 | tr -d '"') + unzip ninja-mac.zip -d /Users/git-bin/gtk/inst/bin + displayName: 'Get Ninja' - bash: | - export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig:$PKG_CONFIG_PATH" - export LDFLAGS="-L/usr/local/opt/libffi/lib $LDFLAGS" - cmake -GNinja .. -DCMAKE_BUILD_TYPE=${{ parameters.build_type}} ${{ parameters.cmake_flags }} + export PATH="$HOME/.local/bin:/Users/git-bin/gtk/inst/bin:$PATH" + cmake -GNinja -DCMAKE_INSTALL_PREFIX:PATH=/Users/git-bin/gtk/inst .. -DCMAKE_BUILD_TYPE=${{ parameters.build_type }} ${{ parameters.cmake_flags }} + # Make sure pot is up to date with sources (maybe translation pipeline is currently running) + cmake --build . --target pot + cmake --build . --target translations + # Build Xournal++ cmake --build . + cmake --build . --target install workingDirectory: ./build displayName: 'Build Xournal++' diff --git a/azure-pipelines/steps/build_mac_native.yml b/azure-pipelines/steps/build_mac_native.yml deleted file mode 100644 index d63ebe959492..000000000000 --- a/azure-pipelines/steps/build_mac_native.yml +++ /dev/null @@ -1,38 +0,0 @@ -parameters: - build_type: '' - cmake_flags: '' - -steps: - - bash: | - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall)" - displayName: 'Uninstall brew' - - bash: | - cd /Users - sudo mkdir git-bin - sudo chown $USER git-bin - cd git-bin - curl -L -o gtk-bin.tar.gz https://github.com/xournalpp/xournalpp-pipeline-dependencies/raw/master/gtk/mac/10.13/gtk-bin.tar.gz - tar -xzf gtk-bin.tar.gz - displayName: 'Unpack GTK' - - bash: | - curl -L -o libxml.tar.gz https://github.com/xournalpp/xournalpp-pipeline-dependencies/raw/master/libxml/mac/10.13/libxml.tar.gz - sudo tar -xzf libxml.tar.gz -C / - displayName: 'Unpack libxml' - - bash: | - mkdir build - displayName: 'Create Build Directory' - - bash: | - curl -L -o ninja-mac.zip $(curl -s https://api.github.com/repos/ninja-build/ninja/releases/latest | grep "browser_download_url.*mac\.zip" | cut -d : -f 2,3 | tr -d '"') - unzip ninja-mac.zip -d /Users/git-bin/gtk/inst/bin - displayName: 'Get Ninja' - - bash: | - export PATH="$HOME/.local/bin:/Users/git-bin/gtk/inst/bin:$PATH" - cmake -GNinja -DCMAKE_INSTALL_PREFIX:PATH=/Users/git-bin/gtk/inst .. -DCMAKE_BUILD_TYPE=${{ parameters.build_type }} ${{ parameters.cmake_flags }} - # Make sure pot is up to date with sources (maybe translation pipeline is currently running) - cmake --build . --target pot - cmake --build . --target translations - # Build Xournal++ - cmake --build . - cmake --build . --target install - workingDirectory: ./build - displayName: 'Build Xournal++' diff --git a/check-source.sh b/check-source.sh deleted file mode 100755 index f94d472fab5e..000000000000 --- a/check-source.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -cppcheck --quiet ./src - diff --git a/development/coding-conventions/README b/development/coding-conventions/README deleted file mode 100644 index ac6be70abb7e..000000000000 --- a/development/coding-conventions/README +++ /dev/null @@ -1,4 +0,0 @@ -You can find current coding conventions info on project's wiki page: -https://github.com/xournalpp/xournalpp/wiki/Coding-conventions - -In this folder are IDE's formatting configurations diff --git a/development/coding-conventions/eclipse.xml b/development/coding-conventions/eclipse.xml deleted file mode 100644 index 2703efeb5329..000000000000 --- a/development/coding-conventions/eclipse.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/development/testcases/Testcases.ods b/development/testcases/Testcases.ods deleted file mode 100644 index 606291973865..000000000000 Binary files a/development/testcases/Testcases.ods and /dev/null differ diff --git a/mac-setup/README.md b/mac-setup/README.md deleted file mode 100644 index 2199a8f91853..000000000000 --- a/mac-setup/README.md +++ /dev/null @@ -1,122 +0,0 @@ -# Build Xournal++ .app -Do not install macports or homebrew. If you have installed it, you need to -create a new user, and use this for the whole process. jhbuild does not work, -if there is such an environment installed. - -One possible way to use jhbuild alongside brew is to unlink all brew modules before running jhbuild. After finishing the build they can be relinked. This is untested though and might fail. - -## Make sure the Development environment is installed -Open a Terminal, and type in `git`, confirm popup from Appstore with "Install" to install development tools. - -## Build Libraries (needs to be done once) -Please take the OS version dependent problems for each step into account. The errors will vary with different versions of the libraries. If you encounter a yet unknown error, feel free to add it to this set of instructions. - -### 1. Build GTK -````bash -./build-gtk3.sh -```` -#### Potential Errors -##### itstool (version 2.0.6 on macOS High Sierra 10.13) -itstool might fail in configure step searching for libxml2 python bindings. - -Follow these steps to resolve the issue: -- Open a shell with option 4 -- Change Python to version 2.7 with `export PYTHON=/usr/bin/python2.7` -- Run the configure step manually with `./configure --prefix $HOME/gtk/inst` -- Exit the shell with `exit` -- Continue the build with option 2 - -##### expat (macOS Mojave 10.14) -The build might fail on expat: -````bash -configure: error: C compiler cannot create executables -```` - -Follow these steps to resolve the issue: -- Open a shell with option 4 -- Run the configure step manually with `./configure --prefix $HOME/gtk/inst` -- Exit the shell with `exit` -- Continue the build with option 2 - -### 2. Start a jhbuild shell -````bash -$HOME/.new_local/bin/jhbuild shell -```` - -### 3. Build Poppler -Execute in this folder. -````bash -./build-poppler.sh -```` - -### 4. Build PortAudio - -````bash -./build-portaudio.sh -```` - -### 5. Build LibZip - -````bash -./build-libzip.sh -```` -#### Potential Errors -##### Unknown module (macOS Mojave 10.14) -**TODO this needs to be improved to meet the standard of this tutorial** - -If there is an error like: -xcode-select: error: tool 'xcodebuild' requires Xcode, but active developer directory '/Library/Developer/CommandLineTools' is a command line tools instance - -https://stackoverflow.com/questions/17980759/xcode-select-active-developer-directory-error/17980786#17980786 -https://github.com/VCVRack/Rack/issues/144 - -**Because autoreconf may not run easy, may you change configure directly at Line 15866** -(search for "Could not find 10.5 to 10.12 SDK") - -Add the following to Makefile.in at line 261 - -```` -elif xcodebuild -version -sdk macosx10.13 Path >/dev/null 2>&1 ; then - mac_version_min="-mmacosx-version-min=10.5" - mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.13 Path`" -elif xcodebuild -version -sdk macosx10.14 Path >/dev/null 2>&1 ; then - mac_version_min="-mmacosx-version-min=10.6" - mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.14 Path`" -```` - -````bash -export PATH="$HOME/.local/bin:$HOME/gtk/inst/bin:$PATH" -autoreconf -if && ./configure --enable-cxx --prefix=$HOME/gtk/inst -```` - -### 6. Build sndfile -**TODO There is currently no support for Opus files so recording and playback might fail.** -````bash -./build-sndfile.sh -```` - -### 7. Build adwaita icon theme -````bash -jhbuild build adwaita-icon-theme -```` - -## Build Xournal++ and package it as .app -````bash -./complete-build.sh $HOME/gtk -```` - -Technical it does: - -### Build Xournal++ -````bash -export PATH="$HOME/.local/bin:$HOME/gtk/inst/bin:$PATH" - -cmake -DCMAKE_INSTALL_PREFIX:PATH=$HOME/gtk/inst .. -make -j 4 -make install -```` - -### Build App -````bash -./build-app.sh $HOME/gtk -```` diff --git a/mac-setup/build-sndfile.sh b/mac-setup/build-sndfile.sh index b94c57601a3a..e313873facaf 100755 --- a/mac-setup/build-sndfile.sh +++ b/mac-setup/build-sndfile.sh @@ -10,6 +10,8 @@ cd libsndfile mkdir build cd build +# TODO add libogg and libvorbis for actual audio support + $HOME/gtk/inst/bin/cmake -DCMAKE_INSTALL_PREFIX:PATH=$HOME/gtk/inst .. make -j8 make install diff --git a/readme/MacBuild.md b/readme/MacBuild.md index 0cc45cdf5ee3..5fd8429aa9bf 100644 --- a/readme/MacBuild.md +++ b/readme/MacBuild.md @@ -1,6 +1,126 @@ -# Xournal++ Mac Build (development) +# Xournal++ MacOS .app Build +Do not install macports or homebrew. If you have installed it, you need to +create a new user, and use this for the whole process. jhbuild does not work, +if there is such an environment installed. -**To create an .app see [Mac Setup](../mac-setup/README.md)** +One possible way to use jhbuild alongside brew is to unlink all brew modules before running jhbuild. After finishing the build they can be relinked. This is untested though and might fail. + +## Make sure the Development environment is installed +Open a Terminal, and type in `git`, confirm popup from Appstore with "Install" to install development tools. + +## Build Libraries (needs to be done once) +Please take the OS version dependent problems for each step into account. The errors will vary with different versions of the libraries. If you encounter a yet unknown error, feel free to add it to this set of instructions. + +### 1. Build GTK +````bash +./build-gtk3.sh +```` +#### Potential Errors +##### itstool (version 2.0.6 on macOS High Sierra 10.13) +itstool might fail in configure step searching for libxml2 python bindings. + +Follow these steps to resolve the issue: +1. Open a shell with option 4 +2. Change Python to version 2.7 with `export PYTHON=/usr/bin/python2.7` +3. Run the configure step manually with `./configure --prefix $HOME/gtk/inst` +4. Exit the shell with `exit` +5. Continue the build with option 2 + +##### expat (macOS Mojave 10.14) +The build might fail on expat: +````bash +configure: error: C compiler cannot create executables +```` + +Follow these steps to resolve the issue: +1. Open a shell with option 4 +2. Run the configure step manually with `./configure --prefix $HOME/gtk/inst` +3. Exit the shell with `exit` +4. Continue the build with option 2 + +### 2. Start a jhbuild shell +````bash +$HOME/.new_local/bin/jhbuild shell +```` + +### 3. Build Poppler +Execute in this folder. +````bash +./build-poppler.sh +```` + +### 4. Build PortAudio + +````bash +./build-portaudio.sh +```` + +### 5. Build LibZip + +````bash +./build-libzip.sh +```` +#### Potential Errors +##### Unknown module (macOS Mojave 10.14) + +If there is an error like: +````bash +xcode-select: error: tool 'xcodebuild' requires Xcode, but active developer directory '/Library/Developer/CommandLineTools' is a command line tools instance +```` + +Follow these steps to resolve the issue: +1. Install Xcode (get it from [here](https://developer.apple.com/xcode/)) if you don't have it yet. +2. Accept the Terms and Conditions. +3. Ensure Xcode app is in the /Applications directory (**NOT** /Users/{user}/Applications). +4. Point xcode-select to the Xcode app Developer directory using the following command: +5. sudo xcode-select -s /Applications/Xcode.app/Contents/Developer +6. Make sure your Xcode app path is correct. + 1. Xcode: /Applications/Xcode.app/Contents/Developer + 2. Xcode-beta: /Applications/Xcode-beta.app/Contents/Developer + +Steps are from this [source](https://stackoverflow.com/questions/17980759/xcode-select-active-developer-directory-error/17980786#17980786). A big thanks to tjmetha and Rob Bednark! + +### 6. Build sndfile +**Recording and playing audio is not yet supported for MacOS.** +````bash +./build-sndfile.sh +```` + +### 7. Build adwaita icon theme +````bash +jhbuild build adwaita-icon-theme +```` + +## Build Xournal++ and package it as .app + +### Automated step + +````bash +./complete-build.sh $HOME/gtk +```` + +### Manual steps + +#### Build Xournal++ +````bash +export PATH="$HOME/.local/bin:$HOME/gtk/inst/bin:$PATH" + +cmake -DCMAKE_INSTALL_PREFIX:PATH=$HOME/gtk/inst .. +make -j 4 +make install +```` + +#### Build App +````bash +./build-app.sh $HOME/gtk +```` + +# Xournal++ Mac Homebrew Build + +**We do not officially support builds with Homebrew. They are solely for convenience.** + +It is highly recommended to either use an official or nightly release. +Should you still want to build your own version please refer to the app-build above. ## Install Homebrew https://brew.sh/ @@ -14,7 +134,7 @@ https://brew.sh/ brew install cmake pkg-config gtk+3 poppler librsvg adwaita-icon-theme ```` -## Basic steps are: +## Build Xournal++: ````bash git clone http://github.com/xournalpp/xournalpp.git cd xournalpp diff --git a/readme/WindowsBuild.md b/readme/WindowsBuild.md index 1f50692ebbe4..ce3e23a8a3aa 100644 --- a/readme/WindowsBuild.md +++ b/readme/WindowsBuild.md @@ -1,34 +1,29 @@ # Xournal++ Windows Build -**Windows Build is working now, but Xournal++ is not yet fully supported -on Windows.** - -See also [Linux Build](LinuxBuild.md) - -Pull requests with fixes to the Code **and to this manual** are welcome! -This manual is not yet completed. - - ![Screenshot](main-win.png?raw=true "Xournal++ Screenshot on Win10") ## Preparation -Install [MSYS2](https://www.msys2.org/) to a short path without spaces. -Install [NSIS](https://nsis.sourceforge.io/Download) to the standard Folder. +1. Install [MSYS2](https://www.msys2.org/) to a short path without spaces. +2. Install [NSIS](https://nsis.sourceforge.io/Download) to the standard directory. +3. Start Mingw-w64 64bit. (Always check if it says **MINGW64** - not 32bit and not MSYS2) -Start Mingw-w64 64bit. (Always check if it says **MINGW64** - not 32bit and not MSYS2) +This will open a console. All following steps happen in this console. -Update MSYS2 (do this multiple times, close the Terminal after each update) +## Update MSYS2 +Do this multiple times, close the Terminal after each update ```bash pacman -Syuu ``` ## Install GIT + ```bash pacman -S git ``` ## Install Build tools + ```bash pacman -S mingw-w64-x86_64-toolchain \ mingw-w64-x86_64-cmake \ @@ -57,19 +52,22 @@ git clone https://github.com/xournalpp/xournalpp.git cd xournalpp/ ``` -## sndfile / PortAudio +## Install sndfile / PortAudio + Build/Install portaudio with ```bash windows-setup/build-portaudio.sh ``` -### Lua +### Install Lua + Build/Install lua with ```bash windows-setup/build-lua.sh ``` -## Build +## Build Xournal++ + ```bash mkdir build cd build/