Move the source into the src directory

Author: radare

.github/workflows/ci.yml

@@ -25,7 +25,9 @@ jobs:
             valac
 
       - name: Build
-        run: make
+        run: |
+          make clean
+          make
 
   build-meson:
     runs-on: ubuntu-24.04
@@ -50,5 +52,6 @@ jobs:
 
       - name: Build with Meson
         run: |
+          rm -rf build-meson
           meson setup build-meson
           meson compile -C build-meson

.gitignore

@@ -1,3 +1,13 @@
-build
-build-*
-valabind
+/build/
+/build-*/
+/config.mk
+/Test.gir
+/valabind
+/valabind.exe
+/valabind.dSYM/
+/vstest.py
+/t/gir/Test.gir
+/t/vala/vstest.c
+/t/vala/vstest.h
+/t/vala/vstest.py
+/t/vala/vstest.vapi

Makefile

@@ -2,6 +2,7 @@ _VERSION=?
 -include config.mk
 
 PWD:=$(shell pwd)
+SRCDIR?=src
 #GIT_TIP=$(shell [ -d .git ] && git log HEAD^..HEAD 2>/dev/null |head -n1|cut -d ' ' -f2)
 GIT_TIP=$(shell git describe --tags)
 DESTDIR?=
@@ -14,14 +15,12 @@ RTLIBS=gobject-2.0 glib-2.0
 VALAPKG:=lib$(shell ./getvv)
 BUILD?=build
 BIN=valabind
-SRC=config.vala main.vala valabindwriter.vala nodeffiwriter.vala utils.vala
-SRC+=girwriter.vala swigwriter.vala cxxwriter.vala ctypeswriter.vala dlangwriter.vala gowriter.vala
-SRC+=vlangwriter.vala
-VAPIS:=$(SRC:%.vala=$(BUILD)/%.vapi)
-CSRC:=$(SRC:%.vala=$(BUILD)/%.c)
-VALA_FILTER=$(filter %.vala,$?)
-TEMPS=$(addprefix --use-fast-vapi=,$(filter-out $(VALA_FILTER:%.vala=$(BUILD)/%.vapi),$(VAPIS)))
-TEMPS+=$(VALA_FILTER) $(patsubst %.vala,$(BUILD)/%.c,$(filter-out $?,$^))
+GENERATED_SRC=$(BUILD)/config.vala
+VALA_SRCS=main.vala valabindwriter.vala nodeffiwriter.vala utils.vala
+VALA_SRCS+=girwriter.vala swigwriter.vala cxxwriter.vala ctypeswriter.vala dlangwriter.vala gowriter.vala
+VALA_SRCS+=vlangwriter.vala
+SRC:=$(GENERATED_SRC) $(addprefix $(SRCDIR)/,$(VALA_SRCS))
+CSRC:=$(VALA_SRCS:%.vala=%.c)
 
 ifneq ($(GIT_TIP),)
 SGIT_TIP=$(shell echo ${GIT_TIP} | sed -e s,${_VERSION},,)
@@ -77,23 +76,15 @@ endif
 w32:
 	$(MAKE) W32=1
 
-.PRECIOUS: $(BUILD)/%.c $(BUILD)/%.vapi
-$(BIN).exe: $(SRC) | $(VAPIS)
-	@echo 'Compiling $(VALA_FILTER) -> $@'
-	$(VALAC) --vapidir=. -D W32 -X "${CFLAGS}" -X "${LDFLAGS}" -o $@ --pkg $(VALAPKG) --save-temps ${TEMPS} windows.c --pkg windows
-	@mv $(VALA_FILTER:%.vala=%.c) $(BUILD)
+$(BIN).exe: $(SRC) $(SRCDIR)/windows.c $(SRCDIR)/windows.vapi
+	@echo 'Compiling $@'
+	$(VALAC) --vapidir=$(SRCDIR) -D W32 -X "${CFLAGS}" -X "${LDFLAGS}" -o $@ --pkg $(VALAPKG) $(SRC) $(SRCDIR)/windows.c --pkg windows
 
-$(BIN): $(SRC) | $(VAPIS)
-	@echo 'Compiling $(VALA_FILTER) -> $@'
-	$(VALAC) -o $@ --pkg posix $(VALA_PRIVATE_CODEGEN) --save-temps ${TEMPS}
-	@mv $(VALA_FILTER:%.vala=%.c) $(BUILD)
+$(BIN): $(SRC)
+	@echo 'Compiling $@'
+	$(VALAC) -o $@ --pkg posix $(VALA_PRIVATE_CODEGEN) $(SRC)
 
-$(BUILD)/%.vapi: %.vala | $(BUILD)
-	@echo 'Generating $< -> $@'
-	@$(VALAC) $(VALAFLAGS) --fast-vapi=$@ $<
-	@${MAKE} config.vala
-
-config.vala: Makefile
+$(GENERATED_SRC): Makefile | $(BUILD)
 	@echo 'Generating $@'
 	@echo 'const string version_string = "$(VERSION)";' > $@
 
@@ -123,13 +114,11 @@ dist:
 shot:
 	rm -rf valabind-$(VERSION)
 	git clone . valabind-$(VERSION)
-	cd valabind-$(VERSION) && $(MAKE) config.vala
 	rm -rf valabind-$(VERSION)/.git
 	tar czvf valabind-$(VERSION).tar.gz valabind-$(VERSION)
 
 mrproper clean:
-	rm -f config.vala
-	rm -rf $(BUILD) $(BIN)
+	rm -rf $(BUILD) $(BIN) $(BIN).exe
 	rm -rf $(CSRC)
 
 deinstall: uninstall

README.md

@@ -35,8 +35,8 @@ patches, ideas, bug reports, etc..
 
 ## Contact
 
-* e-mail:  pancake@nopcode.org
-* fedi: @pancake@infosec.exchange
+* mail: [pancake@nopcode.org](mailto:pancake@nopcode.org)
+* fedi: [@pancake@infosec.exchange](https://infosec.exchange/@pancake)
 
 [1] http://live.gnome.org/Vala  
 [2] http://www.swig.org  

config.vala

@@ -4,17 +4,17 @@ project('valabind', 'c', 'vala',
   ).stdout().strip().split(' ')[1])
 
 sources = files(
-  'ctypeswriter.vala',
-  'cxxwriter.vala',
-  'dlangwriter.vala',
-  'vlangwriter.vala',
-  'girwriter.vala',
-  'gowriter.vala',
-  'nodeffiwriter.vala',
-  'swigwriter.vala',
-  'utils.vala',
-  'valabindwriter.vala',
-  'main.vala',
+  'src/ctypeswriter.vala',
+  'src/cxxwriter.vala',
+  'src/dlangwriter.vala',
+  'src/vlangwriter.vala',
+  'src/girwriter.vala',
+  'src/gowriter.vala',
+  'src/nodeffiwriter.vala',
+  'src/swigwriter.vala',
+  'src/utils.vala',
+  'src/valabindwriter.vala',
+  'src/main.vala',
 )
 
 cc = meson.get_compiler('c')
@@ -51,7 +51,7 @@ config_data = configuration_data()
 config_data.set_quoted('VERSION_STRING', meson.project_version())
 
 config_vala = configure_file(
-  input: 'config.vala.in',
+  input: 'src/config.vala.in',
   output: 'config.vala',
   configuration: config_data,
 )