diff --git a/uppbox/lpbuild2/Makefile b/uppbox/lpbuild2/Makefile index 522a16f44..97dcb8061 100644 --- a/uppbox/lpbuild2/Makefile +++ b/uppbox/lpbuild2/Makefile @@ -12,14 +12,14 @@ OPTS:=CC="cc -g" CXX="c++ -g" CFLAGS="-g" CXXFLAGS="-g" LDFLAGS="-Wl,--gc-sectio ide: sed -i -e 's/IDE_VERSION[ \t]*"\([0-9]*\)[^"]*"/IDE_VERSION "\1-'$(SERIES)-$(ARCH)'"/' $(CURDIR)/uppsrc/ide/version.h - $(MAKE) -f mkfile JOBS=$(JOBS) PKG=ide "NESTS=uppsrc" $(OPTS) "FLAGS=GUI GCC DEBUG DEBUG_FULL" TARGET=`pwd`/$@ + export CCACHE_DISABLE=1; $(MAKE) -f mkfile JOBS=$(JOBS) PKG=ide "NESTS=uppsrc" $(OPTS) "FLAGS=GUI GCC DEBUG DEBUG_FULL STACKTRACE" TARGET=`pwd`/$@ ide-nogtk: sed -i -e 's/IDE_VERSION[ \t]*"\([0-9]*\)[^"]*"/IDE_VERSION "\1-'$(SERIES)-$(ARCH)'-nogtk"/' $(CURDIR)/uppsrc/ide/version.h - $(MAKE) -f mkfile JOBS=$(JOBS) PKG=ide "NESTS=uppsrc" $(OPTS) "FLAGS=GUI NOGTK GCC" TARGET=`pwd`/$@ + export CCACHE_DISABLE=1; $(MAKE) -f mkfile JOBS=$(JOBS) PKG=ide "NESTS=uppsrc" $(OPTS) "FLAGS=GUI NOGTK GCC DEBUG DEBUG_FULL STACKTRACE" TARGET=`pwd`/$@ umk: - $(MAKE) -f mkfile JOBS=$(JOBS) PKG=umk "NESTS=uppsrc" $(OPTS) "FLAGS=GCC" TARGET=`pwd`/$@ + export CCACHE_DISABLE=1; $(MAKE) -f mkfile JOBS=$(JOBS) PKG=umk "NESTS=uppsrc" $(OPTS) "FLAGS=GCC DEBUG DEBUG_FULL STACKTRACE" TARGET=`pwd`/$@ install: # this is just a trick to rename files @@ -29,3 +29,5 @@ install: clean: rm -f ide ide-nogtk umk + +distclean: clean diff --git a/uppbox/lpbuild2/dput.cfg b/uppbox/lpbuild2/dput.cfg index 1cb8c69b8..fcab19266 100644 --- a/uppbox/lpbuild2/dput.cfg +++ b/uppbox/lpbuild2/dput.cfg @@ -1,3 +1,31 @@ +[upp-trusty] +fqdn = ppa.launchpad.net +method = ftp +incoming = ~dolik-rce/upp-nightly/ubuntu/trusty +login = anonymous +allow_unsigned_uploads = 0 + +[upp-saucy] +fqdn = ppa.launchpad.net +method = ftp +incoming = ~dolik-rce/upp-nightly/ubuntu/saucy +login = anonymous +allow_unsigned_uploads = 0 + +[upp-raring] +fqdn = ppa.launchpad.net +method = ftp +incoming = ~dolik-rce/upp-nightly/ubuntu/raring +login = anonymous +allow_unsigned_uploads = 0 + +[upp-quantal] +fqdn = ppa.launchpad.net +method = ftp +incoming = ~dolik-rce/upp-nightly/ubuntu/quantal +login = anonymous +allow_unsigned_uploads = 0 + [upp-precise] fqdn = ppa.launchpad.net method = ftp @@ -32,10 +60,3 @@ method = ftp incoming = ~dolik-rce/upp-nightly/ubuntu/lucid login = anonymous allow_unsigned_uploads = 0 - -[upp-karmic] -fqdn = ppa.launchpad.net -method = ftp -incoming = ~dolik-rce/upp-nightly/ubuntu/karmic -login = anonymous -allow_unsigned_uploads = 0 diff --git a/uppbox/lpbuild2/nightly.cfg b/uppbox/lpbuild2/nightly.cfg index ce2b74406..475484009 100644 --- a/uppbox/lpbuild2/nightly.cfg +++ b/uppbox/lpbuild2/nightly.cfg @@ -23,7 +23,7 @@ RES_DIR="$(dirname $(cd ${0%/*} 2>/dev/null || true; echo $PWD/${0##*/}))" # Launchpad build specific settings ################################### # dists to be build -LP_DISTS="lucid maverick natty oneiric precise" +LP_DISTS="lucid maverick natty oneiric precise raring saucy" # path for temporary files LP_TMP="~/lpbuild.tmp" # options to pass to dput