Split module to separated packages

Makefile

@@ -14,24 +14,28 @@ setup:
 
 # Parameters:
 # $1: prefix
-# $2: include path (of header file)
-# $3: definitions.json filepath
-# $4: structs_and_enums.json filepath
-# $5: typedefs_dict.json filepath
-# $6: additional agruments to codegen call (e.g. -r option)
+# $2: go package name
+# $3: include path (of header file)
+# $4: definitions.json filepath
+# $5: structs_and_enums.json filepath
+# $6: typedefs_dict.json filepath
+# $7: additional agruments to codegen call (e.g. -r option)
 define generate
 	@echo "Generating for $(1)"
-	./codegen -p $(1) -i $(2) -d $(3) -e $(4) -t $(5) $(6)
-	go run mvdan.cc/gofumpt@latest -w $(1)_enums.go
-	go run mvdan.cc/gofumpt@latest -w $(1)_funcs.go
-	go run mvdan.cc/gofumpt@latest -w $(1)_typedefs.go
-	go run golang.org/x/tools/cmd/goimports@latest -w $(1)_funcs.go
-	go run golang.org/x/tools/cmd/goimports@latest -w $(1)_typedefs.go
-	go run golang.org/x/tools/cmd/goimports@latest -w $(1)_enums.go
+	mkdir -p $(2)
+	cat templates/cflags.go |sed -e "s/^package.*/package $(2)/g" > $(2)/cflags.go
+	cd $(2); \
+		../codegen -p $(1) -pkg $(2) -i ../$(3) -d ../$(4) -e ../$(5) -t ../$(6) $(7)
+	go run mvdan.cc/gofumpt@latest -w $(2)/$(1)_enums.go
+	go run mvdan.cc/gofumpt@latest -w $(2)/$(1)_funcs.go
+	go run mvdan.cc/gofumpt@latest -w $(2)/$(1)_typedefs.go
+	go run golang.org/x/tools/cmd/goimports@latest -w $(2)/$(1)_funcs.go
+	go run golang.org/x/tools/cmd/goimports@latest -w $(2)/$(1)_typedefs.go
+	go run golang.org/x/tools/cmd/goimports@latest -w $(2)/$(1)_enums.go
 endef
 
 define cimgui
-	$(call generate,cimgui,cwrappers/cimgui.h,cwrappers/cimgui_templates/definitions.json,cwrappers/cimgui_templates/structs_and_enums.json, cwrappers/cimgui_templates/typedefs_dict.json)
+	$(call generate,cimgui,imgui,cwrappers/cimgui.h,cwrappers/cimgui_templates/definitions.json,cwrappers/cimgui_templates/structs_and_enums.json,cwrappers/cimgui_templates/typedefs_dict.json)
 endef
 
 ## cimgui: generate cimgui binding
@@ -40,7 +44,7 @@ cimgui: setup
 	$(call cimgui)
 
 define cimplot
-	$(call generate,cimplot,cwrappers/cimplot.h,cwrappers/cimplot_templates/definitions.json,cwrappers/cimplot_templates/structs_and_enums.json,cwrappers/cimplot_templates/typedefs_dict.json,-r cwrappers/cimgui_templates/structs_and_enums.json -rt cwrappers/cimgui_templates/typedefs_dict.json)
+	$(call generate,cimplot,implot,cwrappers/cimplot.h,cwrappers/cimplot_templates/definitions.json,cwrappers/cimplot_templates/structs_and_enums.json,cwrappers/cimplot_templates/typedefs_dict.json,-r ../cwrappers/cimgui_templates/structs_and_enums.json -rt ../cwrappers/cimgui_templates/typedefs_dict.json)
 endef
 
 ## cimplot: generate implot binding
@@ -49,7 +53,7 @@ cimplot: setup
 	$(call cimplot)
 
 define cimnodes
-	$(call generate,cimnodes,cwrappers/cimnodes.h,cwrappers/cimnodes_templates/definitions.json,cwrappers/cimnodes_templates/structs_and_enums.json,cwrappers/cimnodes_templates/typedefs_dict.json,-r cwrappers/cimgui_templates/structs_and_enums.json -rt cwrappers/cimgui_templates/typedefs_dict.json)
+	$(call generate,cimnodes,imnodes,cwrappers/cimnodes.h,cwrappers/cimnodes_templates/definitions.json,cwrappers/cimnodes_templates/structs_and_enums.json,cwrappers/cimnodes_templates/typedefs_dict.json,-r ../cwrappers/cimgui_templates/structs_and_enums.json -rt ../cwrappers/cimgui_templates/typedefs_dict.json)
 endef
 
 ## cimnodes: generate imnodes binding
@@ -58,7 +62,7 @@ cimnodes: setup
 	$(call cimnodes)
 
 define cimmarkdown
-	$(call generate,cimmarkdown,cwrappers/cimmarkdown.h,cwrappers/cimmarkdown_templates/definitions.json,cwrappers/cimmarkdown_templates/structs_and_enums.json,cwrappers/cimmarkdown_templates/typedefs_dict.json,-r cwrappers/cimgui_templates/structs_and_enums.json -rt cwrappers/cimgui_templates/typedefs_dict.json)
+	$(call generate,cimmarkdown,immarkdown,cwrappers/cimmarkdown.h,cwrappers/cimmarkdown_templates/definitions.json,cwrappers/cimmarkdown_templates/structs_and_enums.json,cwrappers/cimmarkdown_templates/typedefs_dict.json,-r ../cwrappers/cimgui_templates/structs_and_enums.json -rt ../cwrappers/cimgui_templates/typedefs_dict.json)
 endef
 
 ## cimmarkdown: generate immarkdown binding

backend/backend.go

@@ -8,9 +8,9 @@ package backend
 // extern void dropCallback(void*, int, char**);
 // extern void keyCallback(void*, int, int, int, int);
 // extern void sizeCallback(void*, int, int);
-// #include "../extra_types.h"
-// #include "../cimgui_wrapper.h"
-// #include "../cimgui_typedefs.h"
+// #include "../imgui/extra_types.h"
+// #include "../imgui/cimgui_wrapper.h"
+// #include "../imgui/cimgui_typedefs.h"
 import "C"
 
 import (
@@ -19,7 +19,7 @@ import (
 	"image"
 	"unsafe"
 
-	imgui "github.com/AllenDang/cimgui-go"
+	"github.com/AllenDang/cimgui-go/imgui"
 )
 
 type voidCallbackFunc func()

backend/ebiten-backend/cimgui_backend_impl.go

@@ -4,8 +4,8 @@ import (
 	"image"
 	"unsafe"
 
-	imgui "github.com/AllenDang/cimgui-go"
 	"github.com/AllenDang/cimgui-go/backend"
+	"github.com/AllenDang/cimgui-go/imgui"
 	"github.com/hajimehoshi/ebiten/v2"
 )
 

backend/ebiten-backend/ebiten_api.go

@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"slices"
 
-	imgui "github.com/AllenDang/cimgui-go"
+	"github.com/AllenDang/cimgui-go/imgui"
 	"github.com/hajimehoshi/ebiten/v2"
 	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
 	"github.com/hajimehoshi/ebiten/v2/inpututil"

backend/ebiten-backend/ebiten_backend.go

@@ -3,8 +3,8 @@ package ebitenbackend
 import (
 	"runtime"
 
-	imgui "github.com/AllenDang/cimgui-go"
 	"github.com/AllenDang/cimgui-go/backend"
+	"github.com/AllenDang/cimgui-go/imgui"
 	"github.com/hajimehoshi/ebiten/v2"
 )
 

backend/ebiten-backend/keymap.go

@@ -1,7 +1,7 @@
 package ebitenbackend
 
 import (
-	imgui "github.com/AllenDang/cimgui-go"
+	"github.com/AllenDang/cimgui-go/imgui"
 	"github.com/hajimehoshi/ebiten/v2"
 	"github.com/hajimehoshi/ebiten/v2/inpututil"
 )

backend/ebiten-backend/render.go

@@ -5,8 +5,8 @@ import (
 	"image"
 	"unsafe"
 
-	imgui "github.com/AllenDang/cimgui-go"
 	"github.com/AllenDang/cimgui-go/backend/ebiten-backend/internal/native"
+	"github.com/AllenDang/cimgui-go/imgui"
 	"github.com/hajimehoshi/ebiten/v2"
 )
 

backend/ebiten-backend/txcache.go

@@ -1,7 +1,7 @@
 package ebitenbackend
 
 import (
-	imgui "github.com/AllenDang/cimgui-go"
+	"github.com/AllenDang/cimgui-go/imgui"
 	"github.com/hajimehoshi/ebiten/v2"
 )
 

backend/glfwbackend/glfw_backend.go

@@ -18,9 +18,9 @@ import (
 	"image/draw"
 	"unsafe"
 
-	imgui "github.com/AllenDang/cimgui-go"
 	"github.com/AllenDang/cimgui-go/backend"
-	"github.com/AllenDang/cimgui-go/internal/datautils"
+	"github.com/AllenDang/cimgui-go/datautils"
+	"github.com/AllenDang/cimgui-go/imgui"
 )
 
 type voidCallbackFunc func()

backend/glfwbackend/glfw_backend.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../cimgui_wrapper.h"
+#include "../../imgui/cimgui_wrapper.h"
 #include "../../thirdparty/glfw/include/GLFW/glfw3.h" // Will drag system OpenGL headers
-#include "../../extra_types.h"
+#include "../../imgui/extra_types.h"
 
 #ifdef __cplusplus
 extern "C" {

backend/sdlbackend/sdl_backend.go

@@ -19,9 +19,9 @@ import (
 	"image/draw"
 	"unsafe"
 
-	imgui "github.com/AllenDang/cimgui-go"
 	"github.com/AllenDang/cimgui-go/backend"
-	"github.com/AllenDang/cimgui-go/internal/datautils"
+	"github.com/AllenDang/cimgui-go/datautils"
+	"github.com/AllenDang/cimgui-go/imgui"
 )
 
 type voidCallbackFunc func()

backend/sdlbackend/sdl_backend.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../cimgui_wrapper.h"
+#include "../../imgui/cimgui_wrapper.h"
 #include "../../thirdparty/SDL/include/SDL.h" // Will drag system OpenGL headers
-#include "../../extra_types.h"
+#include "../../imgui/extra_types.h"
 
 #ifdef __cplusplus
 extern "C" {

backend/texture.go

@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	imgui "github.com/AllenDang/cimgui-go"
+	"github.com/AllenDang/cimgui-go/imgui"
 )
 
 type Texture struct {