Selaa lähdekoodia

Build system: Move template-based debian build into debian-template

We are going to want to introduce a real Debian source package build
system.  But that needs to contain a lot of things in debian/ which
ought not to appear in the .deb made by the existing ad-hoc `./build
debian' arrangements, which we want to keep so as not to unduly
disturb existing users.

So rename the whole debian/ directory to debian-template/ and change
all references in the build system.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
pull/62/head
Ian Jackson 8 vuotta sitten
vanhempi
commit
ac0f074ff7
8 muutettua tiedostoa jossa 17 lisäystä ja 17 poistoa
  1. +2
    -2
      .gitignore
  2. +3
    -3
      build
  3. +0
    -0
      debian-template/wiringPi/DEBIAN/control
  4. +0
    -0
      debian-template/wiringPi/DEBIAN/postinst
  5. +0
    -0
      debian-template/wiringPi/DEBIAN/postrm
  6. +5
    -5
      devLib/Makefile
  7. +2
    -2
      gpio/Makefile
  8. +5
    -5
      wiringPi/Makefile

+ 2
- 2
.gitignore Näytä tiedosto

@@ -2,6 +2,6 @@
*.so
lib*.so.*
*~
debian/wiringPi
debian/wiringpi-*.deb
debian-template/wiringPi
debian-template/wiringpi-*.deb
gpio/gpio

+ 3
- 3
build Näytä tiedosto

@@ -77,15 +77,15 @@ fi

if [ x$1 = "xdebian" ]; then
here=`pwd`
cd debian/wiringPi
cd debian-template/wiringPi
rm -rf usr
cd $here/wiringPi
make install-deb
cd $here/devLib
make install-deb INCLUDE='-I. -I../wiringPi'
cd $here/gpio
make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian/wiringPi/usr/lib
cd $here/debian
make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian-template/wiringPi/usr/lib
cd $here/debian-template
fakeroot dpkg-deb --build wiringPi
mv wiringPi.deb wiringpi-`cat $here/VERSION`-1.deb
exit


debian/wiringPi/DEBIAN/control → debian-template/wiringPi/DEBIAN/control Näytä tiedosto


debian/wiringPi/DEBIAN/postinst → debian-template/wiringPi/DEBIAN/postinst Näytä tiedosto


debian/wiringPi/DEBIAN/postrm → debian-template/wiringPi/DEBIAN/postrm Näytä tiedosto


+ 5
- 5
devLib/Makefile Näytä tiedosto

@@ -104,12 +104,12 @@ install-static: $(STATIC)
.PHONY: install-deb
install-deb: $(DYNAMIC)
$Q echo "[Install Headers: deb]"
$Q install -m 0755 -d ~/wiringPi/debian/wiringPi/usr/include
$Q install -m 0644 $(HEADERS) ~/wiringPi/debian/wiringPi/usr/include
$Q install -m 0755 -d ~/wiringPi/debian-template/wiringPi/usr/include
$Q install -m 0644 $(HEADERS) ~/wiringPi/debian-template/wiringPi/usr/include
$Q echo "[Install Dynamic Lib: deb]"
install -m 0755 -d ~/wiringPi/debian/wiringPi/usr/lib
install -m 0755 libwiringPiDev.so.$(VERSION) ~/wiringPi/debian/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)
ln -sf ~/wiringPi/debian/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION) ~/wiringPi/debian/wiringPi/usr/lib/libwiringPiDev.so
install -m 0755 -d ~/wiringPi/debian-template/wiringPi/usr/lib
install -m 0755 libwiringPiDev.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)
ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so

.PHONY: uninstall
uninstall:


+ 2
- 2
gpio/Makefile Näytä tiedosto

@@ -81,8 +81,8 @@ install: gpio
.PHONY: install-deb
install-deb: gpio
$Q echo "[Install: deb]"
$Q install -m 0755 -d ~/wiringPi/debian/wiringPi/usr/bin
$Q install -m 0755 gpio ~/wiringPi/debian/wiringPi/usr/bin
$Q install -m 0755 -d ~/wiringPi/debian-template/wiringPi/usr/bin
$Q install -m 0755 gpio ~/wiringPi/debian-template/wiringPi/usr/bin

.PHONY: uninstall
uninstall:


+ 5
- 5
wiringPi/Makefile Näytä tiedosto

@@ -128,12 +128,12 @@ install-static: $(STATIC)
.PHONY: install-deb
install-deb: $(DYNAMIC)
$Q echo "[Install Headers: deb]"
$Q install -m 0755 -d ~/wiringPi/debian/wiringPi/usr/include
$Q install -m 0644 $(HEADERS) ~/wiringPi/debian/wiringPi/usr/include
$Q install -m 0755 -d ~/wiringPi/debian-template/wiringPi/usr/include
$Q install -m 0644 $(HEADERS) ~/wiringPi/debian-template/wiringPi/usr/include
$Q echo "[Install Dynamic Lib: deb]"
install -m 0755 -d ~/wiringPi/debian/wiringPi/usr/lib
install -m 0755 libwiringPi.so.$(VERSION) ~/wiringPi/debian/wiringPi/usr/lib/libwiringPi.so.$(VERSION)
ln -sf ~/wiringPi/debian/wiringPi/usr/lib/libwiringPi.so.$(VERSION) ~/wiringPi/debian/wiringPi/usr/lib/libwiringPi.so
install -m 0755 -d ~/wiringPi/debian-template/wiringPi/usr/lib
install -m 0755 libwiringPi.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)
ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so

.PHONY: uninstall
uninstall:


Ladataan…
Peruuta
Tallenna