Use Pitchfork layout

See https://github.com/vector-of-bool/pitchfork Signed-off-by: onox <[email protected]>
onox · Oct 30, 2019 · 78c1d68 · 78c1d68
1 parent 252f79a
commit 78c1d68
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
-/lib/
-/obj/
+/build/
 /bin/
 /auto.cgpr
 *.swp

diff --git a/Makefile b/Makefile
@@ -15,32 +15,32 @@ alidir     = $(libdir)
 .PHONY: build debug profile tools format clean install
 
 build:
-	$(GNATMAKE) -P dcf_ada.gpr -cargs $(CFLAGS)
+	$(GNATMAKE) -P tools/dcf_ada.gpr -cargs $(CFLAGS)
 
 debug:
-	$(GNATMAKE) -P dcf_ada.gpr -XMode=debug -cargs $(CFLAGS)
+	$(GNATMAKE) -P tools/dcf_ada.gpr -XMode=debug -cargs $(CFLAGS)
 
 profile:
-	$(GNATMAKE) -P dcf_ada.gpr -XMode=profiling -cargs $(CFLAGS)
+	$(GNATMAKE) -P tools/dcf_ada.gpr -XMode=profiling -cargs $(CFLAGS)
 
 tools:
-	$(GNATMAKE) -P tools.gpr -cargs $(CFLAGS)
+	$(GNATMAKE) -P tools/tools.gpr -cargs $(CFLAGS)
 
 format:
-	$(GNATPP) -P dcf_ada.gpr -XMode=debug -cargs $(CFLAGS)
-	$(GNATPP) -P tools.gpr -XMode=debug -cargs $(CFLAGS)
+	$(GNATPP) -P tools/dcf_ada.gpr -XMode=debug -cargs $(CFLAGS)
+	$(GNATPP) -P tools/tools.gpr -XMode=debug -cargs $(CFLAGS)
 	rm **/*.npp
 
 clean:
-	$(GNATCLEAN) -P dcf_ada.gpr
-	$(GNATCLEAN) -P tools.gpr
-	rm -rf bin lib obj
+	$(GNATCLEAN) -P tools/dcf_ada.gpr
+	$(GNATCLEAN) -P tools/tools.gpr
+	rm -rf bin build
 
 install:
-	$(GNATINSTALL) --relocate-build-tree -p -q -f --install-name='dcf-ada' \
+	$(GNATINSTALL) -p -q -f --install-name='dcf-ada' \
 		--sources-subdir=$(includedir) \
 		--project-subdir=$(gprdir) \
 		--lib-subdir=$(libdir) \
 		--ali-subdir=$(alidir) \
-		--prefix=$(PREFIX) -P dcf_ada.gpr
+		--prefix=$(PREFIX) -P tools/dcf_ada.gpr
 	install bin/* $(PREFIX)/bin/
diff --git a/doc/appnote.2014.txt → docs/appnote.2014.txt b/doc/appnote.2014.txt → docs/appnote.2014.txt
diff --git a/doc/appnote.txt → docs/appnote.txt b/doc/appnote.txt → docs/appnote.txt
diff --git a/tools/my_resolve_conflict.adb → src/tools/my_resolve_conflict.adb b/tools/my_resolve_conflict.adb → src/tools/my_resolve_conflict.adb
diff --git a/tools/unzipdcf.adb → src/tools/unzipdcf.adb b/tools/unzipdcf.adb → src/tools/unzipdcf.adb
diff --git a/tools/zipdcf.adb → src/tools/zipdcf.adb b/tools/zipdcf.adb → src/tools/zipdcf.adb
diff --git a/config.gpr → tools/config.gpr b/config.gpr → tools/config.gpr
diff --git a/dcf_ada.gpr → tools/dcf_ada.gpr b/dcf_ada.gpr → tools/dcf_ada.gpr
@@ -28,13 +28,13 @@ project DCF_Ada is
 
    for Create_Missing_Dirs use "True";
 
-   for Source_Dirs use ("src");
-   for Object_Dir  use "obj";
+   for Source_Dirs use ("../src");
+   for Object_Dir  use "../build/obj";
 
    for Library_Name use "dcf-ada";
    for Library_Version use "libdcf-ada.so." & Config.Version;
-   for Library_Dir  use "lib";
-   for Library_ALI_Dir use "lib/dcf-ada";
+   for Library_Dir  use "../build/lib";
+   for Library_ALI_Dir use "../build/lib/dcf-ada";
    for Library_Kind use "relocatable";
 
    package Ide renames Config.Ide;

diff --git a/gnat.adc → tools/gnat.adc b/gnat.adc → tools/gnat.adc
diff --git a/tools.gpr → tools/tools.gpr b/tools.gpr → tools/tools.gpr
@@ -29,10 +29,10 @@ project Tools is
 
    for Create_Missing_Dirs use "True";
 
-   for Object_Dir  use "obj/tools";
-   for Exec_Dir use "bin";
+   for Object_Dir  use "../build/obj/tools";
+   for Exec_Dir use "../bin";
 
-   for Source_Dirs use ("tools");
+   for Source_Dirs use ("../src/tools");
 
    Executables := (
       "unzipdcf",