Changeset db6b8d3 for debian


Ignore:
Timestamp:
Jul 23, 2012 11:20:23 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
2991094
Parents:
c61a185
Message:

debian: minor improvements to the build script

  • Tighten setting of Debian version in I2P
  • Ensure the clean target will remove .so and .o files
File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/rules

    rc61a185 rdb6b8d3  
    3232export EXTRAPREFIX := deb
    3333export JAVA_HOME I2P
    34 export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/Version:/{print $$2}' |sed 's/.*-\([[:digit:]]\{1,\}\).*$$/\1/')
     34export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([0-9A-Za-z~]\{1,\}\)$$/\1/')
    3535#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
    3636
     
    4444        dh_auto_clean
    4545        ant distclean
    46         rm -f core/c/jbigi/*.[s]o
    47         rm -rf core/c/jcpuid/lib/
     46        find $(CURDIR)/core -name '*\.[s]o' -exec rm -f {} \;
     47        rm -rf $(CURDIR)/core/c/jcpuid/lib/
    4848        #rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
    4949        debconf-updatepo
     
    5454build-indep:
    5555        dh_prep
    56         cp -f $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak
     56        if [ ! -e $(CURDIR)/debian/routerversion.java.bak ]; then \
     57                cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
     58        fi
     59ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
    5760        sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
    5861        mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
    59         # The next line is used by KYTV when building from source packages
    60         #[ -r jetty/jetty-5.1.15.tgz ] && ln -sf $(CURDIR)/jetty/jetty-5.1.15.tgz $(CURDIR)/apps/jetty/jetty-5.1.15.tgz
    61         ant preppkg-unix javadoc
     62else
     63        @echo "Already found deb in version, not doing anything"
     64endif
     65        TZ=UTC ant preppkg-unix javadoc
    6266        echo router.updateDisabled=true > $(I2P)/router.config
    6367        mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
Note: See TracChangeset for help on using the changeset viewer.