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.

Sign up for GitHub

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

Jump to bottom

Project file for linux, fix some minor warnings, update gitignore #1

Merged
merged 1 commit into from Sep 15, 2023
Merged

Project file for linux, fix some minor warnings, update gitignore #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -5,3 +5,7 @@
/GitBlocks.cbplugin
/GitBlocks.dll
/GitBlocks.zip
/.cache/
/GitBlocks.so
/compile_commands.json
/libGitBlocks.so
92 changes: 92 additions & 0 deletions GitBlocks_wx30_unix.cbp
View file
Open in desktop
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="GitBlocks wx3.0.x (64 bit)" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="to_codeblocks_wx30">
<Option output="GitBlocks" prefix_auto="1" extension_auto="1" />
<Option object_output=".objs/to_codeblocks_wx30" />
<Option type="3" />
<Option compiler="gcc" />
<Option host_application="codeblocks" />
<Option run_host_application_in_terminal="0" />
<Compiler>
<Add option="-Wall" />
<Add option="-g" />
<Add option="`wx-config --cflags --version=3.0`" />
<Add option="-std=c++11" />
<Add option="-fPIC" />
<Add directory="include" />
<Add directory="$(#cb)/include" />
<Add directory="$(#cb)/sdk/wxscintilla/include" />
</Compiler>
<Linker>
<Add option="`pkg-config --libs codeblocks`" />
<Add option="`wx-config --libs --version=3.0`" />
</Linker>
<ExtraCommands>
<Add after="zip -j9 GitBlocks.zip manifest.xml" />
<Add after="cp -f libGitBlocks.so GitBlocks.so" />
<Add after="zip -j9 GitBlocks.cbplugin GitBlocks.so GitBlocks.zip" />
<Mode after="always" />
</ExtraCommands>
</Target>
</Build>
<Unit filename="AUTHORS" />
<Unit filename="COPYING" />
<Unit filename="ChangeLog" />
<Unit filename="INSTALL" />
<Unit filename="Makefile.am" />
<Unit filename="NEWS" />
<Unit filename="README" />
<Unit filename="bootstrap" />
<Unit filename="config.h.in" />
<Unit filename="configure.ac" />
<Unit filename="include/CloneDialog.h" />
<Unit filename="include/CommitAllDialog.h" />
<Unit filename="include/CommitDialog.h" />
<Unit filename="include/FolderDialog.h" />
<Unit filename="include/GitBlocks.h" />
<Unit filename="include/NewBranchDialog.h" />
<Unit filename="include/RemoveDialog.h" />
<Unit filename="include/RenameDialog.h" />
<Unit filename="include/SwitchBranchDialog.h" />
<Unit filename="manifest.xml" />
<Unit filename="src/CloneDialog.cpp" />
<Unit filename="src/CommitAllDialog.cpp" />
<Unit filename="src/CommitDialog.cpp" />
<Unit filename="src/FolderDialog.cpp" />
<Unit filename="src/GitBlocks.cpp" />
<Unit filename="src/NewBranchDialog.cpp" />
<Unit filename="src/RemoveDialog.cpp" />
<Unit filename="src/RenameDialog.cpp" />
<Unit filename="src/SwitchBranchDialog.cpp" />
<Unit filename="wxsmith/CloneDialog.wxs" />
<Unit filename="wxsmith/CommitAllDialog.wxs" />
<Unit filename="wxsmith/CommitDialog.wxs" />
<Unit filename="wxsmith/FolderDialog.wxs" />
<Unit filename="wxsmith/NewBranchDialog.wxs" />
<Unit filename="wxsmith/RemoveDialog.wxs" />
<Unit filename="wxsmith/RenameDialog.wxs" />
<Unit filename="wxsmith/SwitchBranchDialog.wxs" />
<Extensions>
<lib_finder disable_auto="1" />
<wxsmith version="1">
<gui name="wxWidgets" src="" main="" init_handlers="necessary" language="CPP" />
<resources>
<wxDialog wxs="wxsmith/CommitAllDialog.wxs" src="src/CommitAllDialog.cpp" hdr="include/CommitAllDialog.h" fwddecl="0" i18n="1" name="CommitAllDialog" language="CPP" />
<wxDialog wxs="wxsmith/CloneDialog.wxs" src="src/CloneDialog.cpp" hdr="include/CloneDialog.h" fwddecl="0" i18n="1" name="CloneDialog" language="CPP" />
<wxDialog wxs="wxsmith/CommitDialog.wxs" src="src/CommitDialog.cpp" hdr="include/CommitDialog.h" fwddecl="0" i18n="1" name="CommitDialog" language="CPP" />
<wxDialog wxs="wxsmith/FolderDialog.wxs" src="src/FolderDialog.cpp" hdr="include/FolderDialog.h" fwddecl="0" i18n="1" name="FolderDialog" language="CPP" />
<wxDialog wxs="wxsmith/NewBranchDialog.wxs" src="src/NewBranchDialog.cpp" hdr="include/NewBranchDialog.h" fwddecl="0" i18n="1" name="NewBranchDialog" language="CPP" />
<wxDialog wxs="wxsmith/RemoveDialog.wxs" src="src/RemoveDialog.cpp" hdr="include/RemoveDialog.h" fwddecl="0" i18n="1" name="RemoveDialog" language="CPP" />
<wxDialog wxs="wxsmith/RenameDialog.wxs" src="src/RenameDialog.cpp" hdr="include/RenameDialog.h" fwddecl="0" i18n="1" name="RenameDialog" language="CPP" />
<wxDialog wxs="wxsmith/SwitchBranchDialog.wxs" src="src/SwitchBranchDialog.cpp" hdr="include/SwitchBranchDialog.h" fwddecl="0" i18n="1" name="SwitchBranchDialog" language="CPP" />
</resources>
</wxsmith>
</Extensions>
</Project>
</CodeBlocks_project_file>
2 changes: 1 addition & 1 deletion src/CommitDialog.cpp
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ CommitDialog::CommitDialog(wxWindow* parent,wxWindowID id,const wxPoint& pos,con

cbProject *project = Manager::Get()->GetProjectManager()->GetActiveProject();
FileChoice->Append(project->GetFilename());
for(unsigned int i=0;i<project->GetFilesCount();i++)
for( int i=0; i<project->GetFilesCount(); i++)
FileChoice->Append(project->GetFile(i)->relativeFilename);
}

Expand Down
2 changes: 1 addition & 1 deletion src/GitBlocks.cpp
View file
Open in desktop
Expand Up @@ -269,7 +269,7 @@ void GitBlocks::CommitAll(wxCommandEvent &event)

command = git + _T(" add");
command += _T(" ") + project->GetFilename();
for(unsigned int i=0;i<project->GetFilesCount();i++)
for(int i=0; i<project->GetFilesCount(); i++)
command += _T(" ") + project->GetFile(i)->relativeFilename;
Execute(command, _("Adding files ..."));

Expand Down
2 changes: 1 addition & 1 deletion src/RemoveDialog.cpp
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ RemoveDialog::RemoveDialog(wxWindow* parent,wxWindowID id,const wxPoint& pos,con
//*)

cbProject *project = Manager::Get()->GetProjectManager()->GetActiveProject();
for(unsigned int i=0;i<project->GetFilesCount();i++)
for(int i=0; i<project->GetFilesCount(); i++)
FileChoice->Append(project->GetFile(i)->relativeFilename);
}

Expand Down