summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-12-13 15:48:10 -0800
committerKeith Packard <keithp@keithp.com>2017-12-13 15:48:10 -0800
commit80ceb11c62e964eac64abdb9eb384f14280e1800 (patch)
treeed451de9c9fa14d30131def9d04c0433d076d53f
parentfa8997ab2598ee84d2cf5805740408e50d2ca57b (diff)
Add files used to merge the repositories
Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--duplicate-files10
-rw-r--r--merge-makefile19
-rw-r--r--merge-protos6
-rw-r--r--move-protos21
-rw-r--r--protos38
5 files changed, 94 insertions, 0 deletions
diff --git a/duplicate-files b/duplicate-files
new file mode 100644
index 0000000..86279b3
--- /dev/null
+++ b/duplicate-files
@@ -0,0 +1,10 @@
+./.gitignore
+./AUTHORS
+./autogen.sh
+./configure.ac
+./COPYING
+./docbook.am
+./Makefile.am
+./README
+./specs/Makefile.am
+./specs/.gitignore
diff --git a/merge-makefile b/merge-makefile
new file mode 100644
index 0000000..9bdba77
--- /dev/null
+++ b/merge-makefile
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+for i in `cat protos`; do
+ sed -e "s/^pkgconfig/${i}pkgconfig/" \
+ -e "s/EXTRA_DIST/${i}_EXTRA_DIST/" \
+ -e 's/#.*$//' \
+ -e '/MAINTAINERCLEANFILES/d' \
+ -e '/PHONY/d' \
+ -e '/SUBDIRS=specs/d' \
+ -e '/ChangeLog/d' \
+ -e '/CHANGELOG/d' \
+ -e '/INSTALL/d' \
+ -e '/dist-hook/d' \
+ $i/Makefile.am
+done | cat -s |
+ awk '/dist_doc_DATA/ { doc[ndoc++] = $3; }
+ { print $0 }
+ END { print "SUBDIRS=specs"; print; print "dist_doc_DATA = \\"; for (i in doc) printf "\t%s \\\n", doc[i]; }'
+
diff --git a/merge-protos b/merge-protos
new file mode 100644
index 0000000..758fc46
--- /dev/null
+++ b/merge-protos
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for i in `cat protos | grep -v x11proto`; do
+ git merge --allow-unrelated-histories $i/master --commit --no-edit -m"Merge $i"
+ ./move-protos $i
+done
diff --git a/move-protos b/move-protos
new file mode 100644
index 0000000..8539ae9
--- /dev/null
+++ b/move-protos
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+case $# in
+ 1)
+ me="$1"
+ ;;
+ *)
+ echo 'Usage: $0 <my-name>'
+ exit 1
+ ;;
+esac
+
+for i in `cat duplicate-files`; do
+ if [ -f $i ]; then
+ mkdir -p $me/`dirname $i`
+ echo git mv $i $me/$i
+ git mv $i $me/$i
+ fi
+done
+
+git commit -m"Move common $me files out of the way"
diff --git a/protos b/protos
new file mode 100644
index 0000000..0022f1d
--- /dev/null
+++ b/protos
@@ -0,0 +1,38 @@
+applewmproto
+bigreqsproto
+calibrateproto
+compositeproto
+damageproto
+dmxproto
+dri2proto
+dri3proto
+evieproto
+fixesproto
+fontcacheproto
+fontsproto
+glproto
+inputproto
+kbproto
+lg3dproto
+panoramixproto
+pmproto
+presentproto
+printproto
+randrproto
+recordproto
+renderproto
+resourceproto
+scrnsaverproto
+trapproto
+videoproto
+windowswmproto
+x11proto
+xcmiscproto
+xextproto
+xf86bigfontproto
+xf86dgaproto
+xf86driproto
+xf86miscproto
+xf86rushproto
+xf86vidmodeproto
+xineramaproto