Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workbench: added option to let git decide which files to display #879

Merged
merged 1 commit into from
Jul 18, 2019

Conversation

lpaulsen93
Copy link
Contributor

In the directory settings it is now possible to choose between a workbench or a git file filter. The later is new and lets git decide which files to display depending on the contents of the .gitignore file.

This also adds a new function to the utils-lib called gp_filelist_scan_directory_callback().

See this example screenshot:
DirectorySettingsWithGitOption

@lpaulsen93
Copy link
Contributor Author

lpaulsen93 commented Jun 28, 2019

I need some help or advice regarding Travis CI. The build of the workbench plugin failed with this error message:

../../../workbench/src/plugin_main.c:28:18: fatal error: git2.h: No such file or directory
 #include <git2.h>

I found this comment in the Travis CI config:

    # Ubuntu 12.04 doesn't have libgit2, 14.04 has a too old one, so we build
    # our own for now.
    #- libgit2-dev

On my local machine I have libgit2-dev installed and can build without problems (Ubuntu 18.04.2). How can I fix this issue?

@elextr
Copy link
Member

elextr commented Jun 28, 2019

There seems to be a logical error in the .travis.yml, the presence of a .pc file for libgit2 is tested here but that doesn't check the version, it just accepts any version.

But that doesn't seem to be the issue here since it doesn't seem to execute the echo in the then clause or the build in the else clause, weird.

@lpaulsen93
Copy link
Contributor Author

@elextr: the issue was caused by an incomplete makefile in the workbench plugin. It missed $(WORKBENCH_CFLAGS) in the workbench_la_CFLAGS. The result was that building it locally on my machine worked, but the Travis CI build failed.

In the directory settings it is now possible to choose between a
workbench or a git file filter. The later is new and lets git decide
which files to display depending on the contents of the .gitignore
file.

This also adds a new function to the utils-lib called
'gp_filelist_scan_directory_callback()'.
@lpaulsen93
Copy link
Contributor Author

Waited 3 weeks an Travis builds are fixed. So I merge this now.

@lpaulsen93 lpaulsen93 merged commit 3f4011e into geany:master Jul 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants