realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move git stuff to kicommon to fix build

Browse Source 
And do other cool stuff
This commit is contained in:
Seth Hillbrand 2025-09-12 07:17:42 -07:00
parent 29025882fc
commit accbee3c6e
22 changed files with 81 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
common/CMakeLists.txt
View File

@ -67,6 +67,30 @@ set( KICOMMON_SRCS
# Gal # Gal
gal/color4d.cpp gal/color4d.cpp
gal/opengl/gl_context_mgr.cpp gal/opengl/gl_context_mgr.cpp
# Git
git/git_add_to_index_handler.cpp
git/git_branch_handler.cpp
git/git_clone_handler.cpp
git/git_commit_handler.cpp
git/git_config_handler.cpp
git/git_compare_handler.cpp
git/git_init_handler.cpp
git/project_git_utils.cpp
git/git_pull_handler.cpp
git/git_push_handler.cpp
git/git_remove_from_index_handler.cpp
git/git_remove_vcs_handler.cpp
git/git_resolve_conflict_handler.cpp
git/git_revert_handler.cpp
git/git_status_handler.cpp
git/git_switch_branch_handler.cpp
git/git_sync_handler.cpp
git/kicad_git_common.cpp
git/kicad_git_errors.cpp
git/git_backend.cpp
git/libgit_backend.cpp
# Jobs # Jobs
jobs/job.cpp jobs/job.cpp
jobs/job_dispatcher.cpp jobs/job_dispatcher.cpp
@ -616,26 +640,6 @@ set( COMMON_IMPORT_GFX_SRCS
import_gfx/svg_import_plugin.cpp import_gfx/svg_import_plugin.cpp
) )
set( COMMON_GIT_SRCS
git/git_add_to_index_handler.cpp
git/git_branch_handler.cpp
git/git_clone_handler.cpp
git/git_commit_handler.cpp
git/git_config_handler.cpp
git/git_init_handler.cpp
git/git_pull_handler.cpp
git/git_push_handler.cpp
git/git_remove_from_index_handler.cpp
git/git_resolve_conflict_handler.cpp
git/git_revert_handler.cpp
git/git_status_handler.cpp
git/git_sync_handler.cpp
git/project_git_utils.cpp
git/kicad_git_common.cpp
git/kicad_git_errors.cpp
git/git_backend.cpp
git/libgit_backend.cpp
)
set( COMMON_SRCS set( COMMON_SRCS
${LIB_KICAD_SRCS} ${LIB_KICAD_SRCS}
@ -648,7 +652,6 @@ set( COMMON_SRCS
${COMMON_IO_SRCS} ${COMMON_IO_SRCS}
${FONT_SRCS} ${FONT_SRCS}
${COMMON_IMPORT_GFX_SRCS} ${COMMON_IMPORT_GFX_SRCS}
${COMMON_GIT_SRCS}
${COMMON_TRANSLINE_CALCULATION_SRCS} ${COMMON_TRANSLINE_CALCULATION_SRCS}
base_screen.cpp base_screen.cpp
bin_mod.cpp bin_mod.cpp

3
common/git/git_add_to_index_handler.h
View File

@ -25,12 +25,13 @@
#define GIT_ADD_TO_INDEX_HANDLER_H_ #define GIT_ADD_TO_INDEX_HANDLER_H_
#include <git/kicad_git_common.h> #include <git/kicad_git_common.h>
#include <import_export.h>
#include <vector> #include <vector>
#include <wx/string.h> #include <wx/string.h>
class LIBGIT_BACKEND; class LIBGIT_BACKEND;
class GIT_ADD_TO_INDEX_HANDLER : public KIGIT_COMMON class APIEXPORT GIT_ADD_TO_INDEX_HANDLER : public KIGIT_COMMON
{ {
public: public:
GIT_ADD_TO_INDEX_HANDLER( git_repository* aRepository ); GIT_ADD_TO_INDEX_HANDLER( git_repository* aRepository );

7
common/git/git_backend.h
View File

@ -25,6 +25,7 @@
#define GIT_BACKEND_H_ #define GIT_BACKEND_H_
#include <map> #include <map>
#include <import_export.h>
#include <set> #include <set>
#include <vector> #include <vector>
#include <wx/string.h> #include <wx/string.h>
@ -56,7 +57,7 @@ enum class CommitResult
Cancelled Cancelled
}; };
class GIT_BACKEND class APIEXPORT GIT_BACKEND
{ {
public: public:
virtual ~GIT_BACKEND() = default; virtual ~GIT_BACKEND() = default;
@ -121,7 +122,7 @@ public:
virtual void PerformRemoveFromIndex( GIT_REMOVE_FROM_INDEX_HANDLER* aHandler ) = 0; virtual void PerformRemoveFromIndex( GIT_REMOVE_FROM_INDEX_HANDLER* aHandler ) = 0;
}; };
GIT_BACKEND* GetGitBackend(); APIEXPORT GIT_BACKEND* GetGitBackend();
void SetGitBackend( GIT_BACKEND* aBackend ); APIEXPORT void SetGitBackend( GIT_BACKEND* aBackend );
#endif #endif

3
common/git/git_branch_handler.h
View File

@ -25,6 +25,7 @@
#define GIT_BRANCH_HANDLER_H #define GIT_BRANCH_HANDLER_H
#include <git/git_repo_mixin.h> #include <git/git_repo_mixin.h>
#include <import_export.h>
#include <wx/string.h> #include <wx/string.h>
#include <vector> #include <vector>
@ -36,7 +37,7 @@ enum class BranchResult
Error Error
}; };
class GIT_BRANCH_HANDLER : public KIGIT_REPO_MIXIN class APIEXPORT GIT_BRANCH_HANDLER : public KIGIT_REPO_MIXIN
{ {
public: public:
GIT_BRANCH_HANDLER( KIGIT_COMMON* aCommon ); GIT_BRANCH_HANDLER( KIGIT_COMMON* aCommon );

3
common/git/git_clone_handler.h
View File

@ -25,10 +25,11 @@
#define GIT_CLONE_HANDLER_H_ #define GIT_CLONE_HANDLER_H_
#include "kicad_git_common.h" #include "kicad_git_common.h"
#include <import_export.h>
#include "git_repo_mixin.h" #include "git_repo_mixin.h"
#include "git_progress.h" #include "git_progress.h"
class GIT_CLONE_HANDLER : public KIGIT_REPO_MIXIN class APIEXPORT GIT_CLONE_HANDLER : public KIGIT_REPO_MIXIN
{ {
public: public:
GIT_CLONE_HANDLER( KIGIT_COMMON* aCommon ); GIT_CLONE_HANDLER( KIGIT_COMMON* aCommon );

3
common/git/git_commit_handler.h
View File

@ -27,6 +27,7 @@
// Define a class to handle git commit operations // Define a class to handle git commit operations
#include <git/kicad_git_common.h> #include <git/kicad_git_common.h>
#include <import_export.h>
#include "git_backend.h" #include "git_backend.h"
#include <string> #include <string>
@ -35,7 +36,7 @@
class LIBGIT_BACKEND; class LIBGIT_BACKEND;
class GIT_COMMIT_HANDLER : public KIGIT_COMMON class APIEXPORT GIT_COMMIT_HANDLER : public KIGIT_COMMON
{ {
public: public:
GIT_COMMIT_HANDLER( git_repository* aRepo ); GIT_COMMIT_HANDLER( git_repository* aRepo );

3
common/git/git_config_handler.h
View File

@ -25,6 +25,7 @@
#define GIT_CONFIG_HANDLER_H #define GIT_CONFIG_HANDLER_H
#include <git/git_repo_mixin.h> #include <git/git_repo_mixin.h>
#include <import_export.h>
#include <wx/string.h> #include <wx/string.h>
struct GitUserConfig struct GitUserConfig
@ -35,7 +36,7 @@ struct GitUserConfig
bool hasEmail = false; bool hasEmail = false;
}; };
class GIT_CONFIG_HANDLER : public KIGIT_REPO_MIXIN class APIEXPORT GIT_CONFIG_HANDLER : public KIGIT_REPO_MIXIN
{ {
public: public:
GIT_CONFIG_HANDLER( KIGIT_COMMON* aCommon ); GIT_CONFIG_HANDLER( KIGIT_COMMON* aCommon );

3
common/git/git_init_handler.h
View File

@ -25,6 +25,7 @@
#define GIT_INIT_HANDLER_H #define GIT_INIT_HANDLER_H
#include <git/git_repo_mixin.h> #include <git/git_repo_mixin.h>
#include <import_export.h>
#include <wx/string.h> #include <wx/string.h>
enum class InitResult enum class InitResult
@ -43,7 +44,7 @@ struct RemoteConfig
KIGIT_COMMON::GIT_CONN_TYPE connType; KIGIT_COMMON::GIT_CONN_TYPE connType;
}; };
class GIT_INIT_HANDLER : public KIGIT_REPO_MIXIN class APIEXPORT GIT_INIT_HANDLER : public KIGIT_REPO_MIXIN
{ {
public: public:
GIT_INIT_HANDLER( KIGIT_COMMON* aCommon ); GIT_INIT_HANDLER( KIGIT_COMMON* aCommon );

3
common/git/git_progress.h
View File

@ -25,10 +25,11 @@
#define GIT_PROGRESS_H_ #define GIT_PROGRESS_H_
#include <widgets/wx_progress_reporters.h> #include <widgets/wx_progress_reporters.h>
#include <import_export.h>
#include <memory> #include <memory>
class GIT_PROGRESS class APIEXPORT GIT_PROGRESS
{ {
public: public:
GIT_PROGRESS() : GIT_PROGRESS() :

3
common/git/git_pull_handler.h
View File

@ -25,6 +25,7 @@
#define _GIT_PULL_HANDLER_H_ #define _GIT_PULL_HANDLER_H_
#include <git/git_repo_mixin.h> #include <git/git_repo_mixin.h>
#include <import_export.h>
#include <vector> #include <vector>
#include <string> #include <string>
@ -51,7 +52,7 @@ enum class PullResult : int
class LIBGIT_BACKEND; class LIBGIT_BACKEND;
class GIT_PULL_HANDLER : public KIGIT_REPO_MIXIN class APIEXPORT GIT_PULL_HANDLER : public KIGIT_REPO_MIXIN
{ {
public: public:
friend class LIBGIT_BACKEND; friend class LIBGIT_BACKEND;

3
common/git/git_push_handler.h
View File

@ -26,6 +26,7 @@
#include <git/git_progress.h> #include <git/git_progress.h>
#include <git/git_repo_mixin.h> #include <git/git_repo_mixin.h>
#include <import_export.h>
#include <git/kicad_git_errors.h> #include <git/kicad_git_errors.h>
#include <wx/string.h> #include <wx/string.h>
@ -37,7 +38,7 @@ enum class PushResult
Error Error
}; };
class GIT_PUSH_HANDLER : public KIGIT_REPO_MIXIN class APIEXPORT GIT_PUSH_HANDLER : public KIGIT_REPO_MIXIN
{ {
public: public:
GIT_PUSH_HANDLER( KIGIT_COMMON* aCommon ); GIT_PUSH_HANDLER( KIGIT_COMMON* aCommon );

3
common/git/git_remove_from_index_handler.h
View File

@ -25,12 +25,13 @@
#define GIT_REMOVE_FROM_INDEX_HANDLER_H_ #define GIT_REMOVE_FROM_INDEX_HANDLER_H_
#include <git/kicad_git_common.h> #include <git/kicad_git_common.h>
#include <import_export.h>
#include <vector> #include <vector>
#include <wx/string.h> #include <wx/string.h>
class LIBGIT_BACKEND; class LIBGIT_BACKEND;
class GIT_REMOVE_FROM_INDEX_HANDLER : public KIGIT_COMMON class APIEXPORT GIT_REMOVE_FROM_INDEX_HANDLER : public KIGIT_COMMON
{ {
public: public:
GIT_REMOVE_FROM_INDEX_HANDLER( git_repository* aRepository ); GIT_REMOVE_FROM_INDEX_HANDLER( git_repository* aRepository );

3
common/git/git_repo_mixin.h
View File

@ -17,8 +17,9 @@
#include "kicad_git_common.h" #include "kicad_git_common.h"
#include "kicad_git_errors.h" #include "kicad_git_errors.h"
#include "git_progress.h" #include "git_progress.h"
#include <import_export.h>
class KIGIT_REPO_MIXIN: public KIGIT_ERRORS, public GIT_PROGRESS class APIEXPORT KIGIT_REPO_MIXIN: public KIGIT_ERRORS, public GIT_PROGRESS
{ {
public: public:
KIGIT_REPO_MIXIN( KIGIT_COMMON* aCommon ) : m_common( aCommon ) KIGIT_REPO_MIXIN( KIGIT_COMMON* aCommon ) : m_common( aCommon )

3
common/git/git_resolve_conflict_handler.h
View File

@ -25,10 +25,11 @@
#define GIT_RESOLVE_CONFLICT_HANDLER_H #define GIT_RESOLVE_CONFLICT_HANDLER_H
#include <git2.h> #include <git2.h>
#include <import_export.h>
class wxString; class wxString;
class GIT_RESOLVE_CONFLICT_HANDLER class APIEXPORT GIT_RESOLVE_CONFLICT_HANDLER
{ {
public: public:
GIT_RESOLVE_CONFLICT_HANDLER( git_repository* aRepository ); GIT_RESOLVE_CONFLICT_HANDLER( git_repository* aRepository );

3
common/git/git_revert_handler.h
View File

@ -25,6 +25,7 @@
#define GIT_REVERT_HANDLER_H_ #define GIT_REVERT_HANDLER_H_
#include <git2.h> #include <git2.h>
#include <import_export.h>
#include <vector> #include <vector>
#include <wx/string.h> #include <wx/string.h>
// TEMPORARY HACKFIX INCLUDE FOR STD::VECTOR EXPORT OUT OF KICOMMON ON WINDOWS // TEMPORARY HACKFIX INCLUDE FOR STD::VECTOR EXPORT OUT OF KICOMMON ON WINDOWS
@ -32,7 +33,7 @@
class LIBGIT_BACKEND; class LIBGIT_BACKEND;
class GIT_REVERT_HANDLER class APIEXPORT GIT_REVERT_HANDLER
{ {
public: public:
GIT_REVERT_HANDLER( git_repository* aRepository ); GIT_REVERT_HANDLER( git_repository* aRepository );

3
common/git/git_status_handler.h
View File

@ -25,6 +25,7 @@
#define GIT_STATUS_HANDLER_H #define GIT_STATUS_HANDLER_H
#include <git/git_repo_mixin.h> #include <git/git_repo_mixin.h>
#include <import_export.h>
#include <wx/string.h> #include <wx/string.h>
#include <map> #include <map>
#include <set> #include <set>
@ -38,7 +39,7 @@ struct FileStatus
unsigned int gitStatus; // Raw git status flags unsigned int gitStatus; // Raw git status flags
}; };
class GIT_STATUS_HANDLER : public KIGIT_REPO_MIXIN class APIEXPORT GIT_STATUS_HANDLER : public KIGIT_REPO_MIXIN
{ {
public: public:
GIT_STATUS_HANDLER( KIGIT_COMMON* aCommon ); GIT_STATUS_HANDLER( KIGIT_COMMON* aCommon );

3
common/git/git_sync_handler.h
View File

@ -25,10 +25,11 @@
#define GIT_SYNC_HANDLER_H_ #define GIT_SYNC_HANDLER_H_
#include <git2.h> #include <git2.h>
#include <import_export.h>
class wxString; class wxString;
class GIT_SYNC_HANDLER class APIEXPORT GIT_SYNC_HANDLER
{ {
public: public:
GIT_SYNC_HANDLER( git_repository* aRepository ); GIT_SYNC_HANDLER( git_repository* aRepository );

5
common/git/kicad_git_blob_reader.h
View File

@ -25,11 +25,12 @@
#include <istream> #include <istream>
#include <string> #include <string>
#include <git2.h> #include <git2.h>
#include <import_export.h>
#include <richio.h> #include <richio.h>
class BLOB_BUFFER_STREAM : public std::streambuf class APIEXPORT BLOB_BUFFER_STREAM : public std::streambuf
{ {
public: public:
BLOB_BUFFER_STREAM( git_blob* aBlob ) BLOB_BUFFER_STREAM( git_blob* aBlob )
@ -57,7 +58,7 @@ public:
}; };
// Build a class that implements LINE_READER for git_blobs // Build a class that implements LINE_READER for git_blobs
class BLOB_READER : public LINE_READER class APIEXPORT BLOB_READER : public LINE_READER
{ {
public: public:
BLOB_READER( git_blob* aBlob ) : m_blob( aBlob ) BLOB_READER( git_blob* aBlob ) : m_blob( aBlob )

19
common/git/kicad_git_common.h
View File

@ -25,6 +25,7 @@
#define _GIT_COMMON_H_ #define _GIT_COMMON_H_
#include <git/kicad_git_errors.h> #include <git/kicad_git_errors.h>
#include <import_export.h>
#include <git2.h> #include <git2.h>
#include <atomic> #include <atomic>
@ -35,7 +36,7 @@
class LIBGIT_BACKEND; class LIBGIT_BACKEND;
class KIGIT_COMMON class APIEXPORT KIGIT_COMMON
{ {
public: public:
@ -193,19 +194,19 @@ private:
static const unsigned KIGIT_CREDENTIAL_SSH_AGENT = 1 << sizeof( m_testedTypes - 1 ); static const unsigned KIGIT_CREDENTIAL_SSH_AGENT = 1 << sizeof( m_testedTypes - 1 );
}; };
extern "C" int progress_cb( const char* str, int len, void* data ); extern "C" APIEXPORT int progress_cb( const char* str, int len, void* data );
extern "C" void clone_progress_cb( const char* str, size_t len, size_t total, void* data ); extern "C" APIEXPORT void clone_progress_cb( const char* str, size_t len, size_t total, void* data );
extern "C" int transfer_progress_cb( const git_transfer_progress* aStats, void* aPayload ); extern "C" APIEXPORT int transfer_progress_cb( const git_transfer_progress* aStats, void* aPayload );
extern "C" int update_cb( const char* aRefname, const git_oid* aFirst, const git_oid* aSecond, extern "C" APIEXPORT int update_cb( const char* aRefname, const git_oid* aFirst, const git_oid* aSecond,
void* aPayload ); void* aPayload );
extern "C" int push_transfer_progress_cb( unsigned int aCurrent, unsigned int aTotal, extern "C" APIEXPORT int push_transfer_progress_cb( unsigned int aCurrent, unsigned int aTotal,
size_t aBytes, void* aPayload ); size_t aBytes, void* aPayload );
extern "C" int push_update_reference_cb( const char* aRefname, const char* aStatus, extern "C" APIEXPORT int push_update_reference_cb( const char* aRefname, const char* aStatus,
void* aPayload ); void* aPayload );
extern "C" int fetchhead_foreach_cb( const char*, const char*, extern "C" APIEXPORT int fetchhead_foreach_cb( const char*, const char*,
const git_oid* aOID, unsigned int aIsMerge, void* aPayload ); const git_oid* aOID, unsigned int aIsMerge, void* aPayload );
extern "C" int credentials_cb( git_cred** aOut, const char* aUrl, const char* aUsername, extern "C" APIEXPORT int credentials_cb( git_cred** aOut, const char* aUrl, const char* aUsername,
unsigned int aAllowedTypes, void* aPayload ); unsigned int aAllowedTypes, void* aPayload );
#endif // _GIT_COMMON_H_ #endif // _GIT_COMMON_H_

2
common/git/kicad_git_errors.h
View File

@ -28,7 +28,7 @@
#include <wx/translation.h> #include <wx/translation.h>
class KIGIT_ERRORS class APIEXPORT KIGIT_ERRORS
{ {
public: public:

3
common/git/libgit_backend.h
View File

@ -25,11 +25,12 @@
#define LIBGIT_BACKEND_H_ #define LIBGIT_BACKEND_H_
#include "git_backend.h" #include "git_backend.h"
#include <import_export.h>
// Forward declarations to avoid exposing libgit2 headers // Forward declarations to avoid exposing libgit2 headers
struct git_annotated_commit; struct git_annotated_commit;
class LIBGIT_BACKEND : public GIT_BACKEND class APIEXPORT LIBGIT_BACKEND : public GIT_BACKEND
{ {
public: public:
void Init() override; void Init() override;

3
common/git/project_git_utils.h
View File

@ -26,12 +26,13 @@
#include <git2.h> #include <git2.h>
#include <wx/string.h> #include <wx/string.h>
#include <import_export.h>
namespace KIGIT namespace KIGIT
{ {
/** Utility class with helper functions for project level git operations. */ /** Utility class with helper functions for project level git operations. */
class PROJECT_GIT_UTILS class APIEXPORT PROJECT_GIT_UTILS
{ {
public: public:
/** /**