diff --git a/Makefile b/Makefile index d673548..687f719 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ .PHONY: debian nocui gocui andlabs -all: - # reset - @echo - @echo This Requires working IPv6 - @echo +all: build debian + +build: nocui gocui andlabs + +notes: ifeq ($(GO111MODULE),) @echo @echo If you are compiling this here, you probably want to set GO111MODULE @@ -32,14 +32,6 @@ andlabs: # go build -C andlabs -v -buildmode=plugin -o ../andlabs.so make -C ../andlabs -something: -ifeq (,$(wildcard go.mod)) - go mod init gui - go mod tidy -endif - make clean - make plugins - build-dep: apt install -f libgtk-3-dev @@ -53,51 +45,13 @@ debian: dpkg-deb -c go-gui-toolkit*.deb -wit mirrors -examples: \ - all \ - examples-helloworld \ - examples-buttons \ - examples-console-ui-helloworld - -# this is the most basic one. This syntax should always work -examples-helloworld: - make -C examples/helloworld - -examples-buttons: - make -C examples/buttons - -examples-console-ui-helloworld: - make -C examples/console-ui-helloworld - -# sync repo to the github backup -# git remote add github git@github.com:witorg/gui.git -# git remote add github2 git@github.com:wit-go/gui.git -github: - git push origin master - git push origin devel - git push origin --tags - git push github master - git push github devel - git push github --tags - @echo - @echo check https://github.com/wit-go/gui - @echo - -redomod: - rm -f go.* - GO111MODULE= go mod init - GO111MODULE= go mod tidy - -doc: - godoc -v - goget: go get -v -t -u make -C toolkit/gocui goget make -C toolkit/andlabs goget clean: - rm -f *.so + rm -f ../*.so cd debian && make clean plugins: plugins-gocui plugins-andlabs diff --git a/README.md b/README.md index e69de29..6392120 100644 --- a/README.md +++ b/README.md @@ -0,0 +1 @@ +# makes a debian package of the toolkits diff --git a/debian/Makefile b/debian/Makefile index fab9648..586d28b 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -1,5 +1,5 @@ # GITVERSION=$(shell git rev-parse FETCH_HEAD) -GUIVERSION=$(shell cd ../../gui && git describe --tags $(git rev-list --tags --max-count=1) | sed 's/^v//') +GUIVERSION=$(shell cd ../../../lib/widget && git describe --tags $(git rev-list --tags --max-count=1) | sed 's/^v//') TOOLKITVERSION=$(shell git describe --tags $(git rev-list --tags --max-count=1) | sed 's/^v//') VERSION=${TOOLKITVERSION}-gui-${GUIVERSION} @@ -24,8 +24,8 @@ clean: extract: mkdir -p ../files/usr/lib/go-gui/${GUIVERSION}/${TOOLKITVERSION} - cp ../*.so ../files/usr/lib/go-gui/${GUIVERSION}/${TOOLKITVERSION}/ - cp ../README.md ../files/usr/lib/go-gui/${GUIVERSION}/${TOOLKITVERSION}/ + cp ../../*.so ../files/usr/lib/go-gui/${GUIVERSION}/${TOOLKITVERSION}/ + # cp ../README.md ../files/usr/lib/go-gui/${GUIVERSION}/${TOOLKITVERSION}/ cd ../files/usr/lib/go-gui/ && ln -s ${GUIVERSION}/${TOOLKITVERSION}/ latest # makes the DEBIAN/ directory @@ -51,9 +51,9 @@ DEBIAN: build: mv DEBIAN ../files/ - cd .. && dpkg-deb --build files ${BASENAME}_${VERSION}_amd64.deb + cd .. && dpkg-deb --build files ../${BASENAME}_${VERSION}_amd64.deb @echo @echo '#######################' - cd .. && dpkg-deb --info ${BASENAME}_${VERSION}_amd64.deb + cd .. && dpkg-deb --info ../${BASENAME}_${VERSION}_amd64.deb @echo '#######################' @echo