Skip to content

Commit a21d0ec

Browse files
gucio321gucio321
authored
Merge pull request #344 from gucio321/fix-vendoring
improve dummy system so that vendoring should work now
2 parents 8a4f9f5 + 1808a80 commit a21d0ec

File tree

7 files changed

+90
-57
lines changed

7 files changed

+90
-57
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ update: setup
126126

127127
# dummy creates dummy.go files to baypass GO vendor policy that excludes everything that has no .go files (including our C source).
128128
define dummy
129-
echo -e "// +build rquired\n\npackage imgui\n\nimport (\n" > dummy.go
129+
echo -e "//go:build required\n// +build rquired\n\npackage imgui\n\nimport (\n" > dummy.go
130130
for i in `find cwrappers -type f \( -name "*.h" -o -name "*.cpp" \) -exec dirname {} \; | sort -u`; do \
131131
cp templates/dummy.go.template $$i/dummy.go; \
132-
echo -e "\t\"github.com/AllenDang/cimgui-go/$$i\"" >> dummy.go; \
132+
echo -e "\t_ \"github.com/AllenDang/cimgui-go/$$i\"" >> dummy.go; \
133133
done
134134
echo ")" >> dummy.go
135135
endef

‎dummy.go‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
// +build rquired
1+
//go:build required
2+
// +build required
23

34
package imgui
45

56
import (
6-
7-
"github.com/AllenDang/cimgui-go/cwrappers"
8-
"github.com/AllenDang/cimgui-go/cwrappers/imgui"
9-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/backends"
10-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_allegro5"
11-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_android_opengl3"
12-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_glfw_opengl2"
13-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_glfw_opengl3"
14-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_glfw_vulkan"
15-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_glfw_wgpu"
16-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_glut_opengl2"
17-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_null"
18-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl2_directx11"
19-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl2_opengl2"
20-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl2_opengl3"
21-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl2_sdlrenderer2"
22-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl2_vulkan"
23-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl3_opengl3"
24-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl3_sdlrenderer3"
25-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_win32_directx10"
26-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_win32_directx11"
27-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_win32_directx12"
28-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_win32_directx9"
29-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_win32_opengl3"
30-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/libs/emscripten"
31-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/libs/glfw/include/GLFW"
32-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/libs/usynergy"
33-
"github.com/AllenDang/cimgui-go/cwrappers/imgui_markdown"
34-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/misc/cpp"
35-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/misc/fonts"
36-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/misc/freetype"
37-
"github.com/AllenDang/cimgui-go/cwrappers/imgui/misc/single_file"
38-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes"
39-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/example"
40-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/b64"
41-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/cgns"
42-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/chartdir"
43-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/cityhash"
44-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/clapack"
45-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/freeimage"
46-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/gettimeofday"
47-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/graphicsmagick"
48-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/gts"
49-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/igraph"
50-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/libaiff"
51-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/libmspack"
52-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/libu2f-server"
53-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/libuuid"
54-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/modp-base64"
55-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/openblas"
56-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/ragel"
57-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project"
58-
"github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/scripts/test_ports/vcpkg-ci-soci/project"
59-
"github.com/AllenDang/cimgui-go/cwrappers/implot"
7+
_ "github.com/AllenDang/cimgui-go/cwrappers"
8+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui"
9+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/backends"
10+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_allegro5"
11+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_android_opengl3"
12+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_glfw_opengl2"
13+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_glfw_opengl3"
14+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_glfw_vulkan"
15+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_glfw_wgpu"
16+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_glut_opengl2"
17+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_null"
18+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl2_directx11"
19+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl2_opengl2"
20+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl2_opengl3"
21+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl2_sdlrenderer2"
22+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl2_vulkan"
23+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl3_opengl3"
24+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_sdl3_sdlrenderer3"
25+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_win32_directx10"
26+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_win32_directx11"
27+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_win32_directx12"
28+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_win32_directx9"
29+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/example_win32_opengl3"
30+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/libs/emscripten"
31+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/libs/glfw/include/GLFW"
32+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/examples/libs/usynergy"
33+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/misc/cpp"
34+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/misc/fonts"
35+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/misc/freetype"
36+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui/misc/single_file"
37+
_ "github.com/AllenDang/cimgui-go/cwrappers/imgui_markdown"
38+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes"
39+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/example"
40+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/b64"
41+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/cgns"
42+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/chartdir"
43+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/cityhash"
44+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/clapack"
45+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/freeimage"
46+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/gettimeofday"
47+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/graphicsmagick"
48+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/gts"
49+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/igraph"
50+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/libaiff"
51+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/libmspack"
52+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/libu2f-server"
53+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/libuuid"
54+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/modp-base64"
55+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/openblas"
56+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/ports/ragel"
57+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project"
58+
_ "github.com/AllenDang/cimgui-go/cwrappers/imnodes/vcpkg/scripts/test_ports/vcpkg-ci-soci/project"
59+
_ "github.com/AllenDang/cimgui-go/cwrappers/implot"
6060
)

‎dummy2.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package dummy

‎imgui/dummy.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//go:build rquired
2+
// +build rquired
3+
4+
package imgui
5+
6+
import (
7+
_ "github.com/AllenDang/cimgui-go"
8+
)

‎immarkdown/dummy.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//go:build rquired
2+
// +build rquired
3+
4+
package imgui
5+
6+
import (
7+
_ "github.com/AllenDang/cimgui-go"
8+
)

‎imnodes/dummy.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//go:build rquired
2+
// +build rquired
3+
4+
package imgui
5+
6+
import (
7+
_ "github.com/AllenDang/cimgui-go"
8+
)

‎implot/dummy.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//go:build rquired
2+
// +build rquired
3+
4+
package imgui
5+
6+
import (
7+
_ "github.com/AllenDang/cimgui-go"
8+
)

0 commit comments

Comments
 (0)