Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
znc/znc
54lman/znc
Adam-/znc
Affix/znc
Agusanz/znc
Alef-Burzmali/znc
BastyJuice/znc
BenjamenMeyer/znc
Brijen/znc
BtbN/znc
CaitlynMainer/znc
CapnRat/znc
ConorOG/znc
CrosseyeJack/znc
CustaiCo/znc
DarthGandalf/znc
DasWuff/znc
Dessimat0r/znc
DrRenX/znc
DreamBNC/znc
Elemecca/znc
EpicnessTwo/znc
FooBarWidget/znc
FruitieX/znc
GDXN/znc
GLolol/znc
Googolplexed/znc
HaleBob/znc
Hasimir/znc
HeisSpiter/znc
IshaqAzmi/znc
James-TR/znc
Jon1155/znc
JrCs/znc
Jyzee/znc
KTE/znc
KiNgMaR/znc
Kriechi/znc
KyoriPowered/znc
Lyude/znc
ManiacTwister/znc
MartinMartimeo/znc
MartinNowack/znc
Mikaela/znc
MrEcho/znc
MushroomWobbit/znc
NeilHanlon/znc
Philantrop/znc
RafalBabinicz/znc
Rikairchy/znc
ShadowDev/znc
Siyo92/znc
SjB/znc
TheBlueMatt/znc
TheWug/znc
TuffLuck/znc
Un1matr1x/znc
Valodim/znc
Whissi/znc
XemnOf/znc
YourBNC/znc
Yus123/znc
Zarthus/znc
aMoniker/znc
akaritakai/znc
ammaraskar/znc
anders/znc
anthonyryan1/znc
atdt/znc
b3rend/znc
bncim/znc
bountysource-support/znc
bpcampbe/znc
built1n/znc
ccverg/znc
chauffer/znc
chpasswd/znc
clem16/znc
cork/znc
corytheboyd/znc
crcastle/znc
cripperz/znc
crosbymichael/znc
davilla/znc
devfom/znc
dgw/znc
dkrisman/znc
dragon788/znc
drbean/znc
dru1d/znc
eatnumber1/znc
elyscape/znc
emilyst/znc
ex0a/znc
felly/znc
fishguy/znc
flakes/znc
flxK/znc
freddy-156/znc
galdor/znc
gisti/znc
gleentea/znc
gorarrh/znc
greecemunky/znc
gtmanfred/znc
gustavoz/znc
hartsock/znc
hirkis/znc
igoryen/znc
ipimpat/znc
jacksonmj/znc
jakoch/znc
jantman/znc
jdarmst/znc
jensjorritsma/znc
jeremiahshirk/znc
jimloco/znc
jpnurmi/znc
jreese/znc
julian-klode/znc
kashike/znc
kebian/znc
khawajaumarfarooq/znc
knivey/znc
krisha/znc
kwakkel1000/znc
kylef/znc
kythyria/znc
langkid1/znc
leedo/znc
leonardopf/znc
libryder/znc
lpm11/znc
lpsmith/znc
luser/znc
m0vie/znc
macressler/znc
madberry/znc
markusj/znc
marsjaninzmarsa/znc
md-5/znc
mloc/znc
mogigoma/znc
mokerjoke/znc
nbchicong/znc
nbebout/znc
necrotic/znc
nephaste/znc
notry4n/znc
nta/znc
nullnick/znc
nurupo/znc
nyuszika7h/znc
okket/znc
ollie27/znc
omgjlk/znc
paultcochrane/znc
pepijndevos/znc
pfsmorigo/znc
prodigeni/znc
psychon/znc
ravomavain/znc
reality/znc
reedloden/znc
rememberedbound/znc
reuben/znc
rickza/znc
robinosan/znc
ru108/znc
rwaldron/znc
schoentoon/znc
sdamashek/znc
sebageek/znc
sgaist/znc
sixstringsg/znc
somasonic/znc
sorbits/znc
specing/znc
stephank/znc
swarfega/znc
techalchemy/znc
templed/znc
thomasf/znc
toddhainsworth/znc
toydestroyer/znc
trisk/znc
tzvetkoff/znc
umorigu/znc
uu1101/znc
vincentbernat/znc
viric/znc
vodik/znc
vrcsix/znc
wchristian/znc
wired/znc
wkonkel/znc
ydin-zz/znc
ylfchild/znc
yuvipanda/znc
zhangshiguang/znc
Nothing to show
Choose a base branch
...
Choose a Head Repository
znc/znc
54lman/znc
Adam-/znc
Affix/znc
Agusanz/znc
Alef-Burzmali/znc
BastyJuice/znc
BenjamenMeyer/znc
Brijen/znc
BtbN/znc
CaitlynMainer/znc
CapnRat/znc
ConorOG/znc
CrosseyeJack/znc
CustaiCo/znc
DarthGandalf/znc
DasWuff/znc
Dessimat0r/znc
DrRenX/znc
DreamBNC/znc
Elemecca/znc
EpicnessTwo/znc
FooBarWidget/znc
FruitieX/znc
GDXN/znc
GLolol/znc
Googolplexed/znc
HaleBob/znc
Hasimir/znc
HeisSpiter/znc
IshaqAzmi/znc
James-TR/znc
Jon1155/znc
JrCs/znc
Jyzee/znc
KTE/znc
KiNgMaR/znc
Kriechi/znc
KyoriPowered/znc
Lyude/znc
ManiacTwister/znc
MartinMartimeo/znc
MartinNowack/znc
Mikaela/znc
MrEcho/znc
MushroomWobbit/znc
NeilHanlon/znc
Philantrop/znc
RafalBabinicz/znc
Rikairchy/znc
ShadowDev/znc
Siyo92/znc
SjB/znc
TheBlueMatt/znc
TheWug/znc
TuffLuck/znc
Un1matr1x/znc
Valodim/znc
Whissi/znc
XemnOf/znc
YourBNC/znc
Yus123/znc
Zarthus/znc
aMoniker/znc
akaritakai/znc
ammaraskar/znc
anders/znc
anthonyryan1/znc
atdt/znc
b3rend/znc
bncim/znc
bountysource-support/znc
bpcampbe/znc
built1n/znc
ccverg/znc
chauffer/znc
chpasswd/znc
clem16/znc
cork/znc
corytheboyd/znc
crcastle/znc
cripperz/znc
crosbymichael/znc
davilla/znc
devfom/znc
dgw/znc
dkrisman/znc
dragon788/znc
drbean/znc
dru1d/znc
eatnumber1/znc
elyscape/znc
emilyst/znc
ex0a/znc
felly/znc
fishguy/znc
flakes/znc
flxK/znc
freddy-156/znc
galdor/znc
gisti/znc
gleentea/znc
gorarrh/znc
greecemunky/znc
gtmanfred/znc
gustavoz/znc
hartsock/znc
hirkis/znc
igoryen/znc
ipimpat/znc
jacksonmj/znc
jakoch/znc
jantman/znc
jdarmst/znc
jensjorritsma/znc
jeremiahshirk/znc
jimloco/znc
jpnurmi/znc
jreese/znc
julian-klode/znc
kashike/znc
kebian/znc
khawajaumarfarooq/znc
knivey/znc
krisha/znc
kwakkel1000/znc
kylef/znc
kythyria/znc
langkid1/znc
leedo/znc
leonardopf/znc
libryder/znc
lpm11/znc
lpsmith/znc
luser/znc
m0vie/znc
macressler/znc
madberry/znc
markusj/znc
marsjaninzmarsa/znc
md-5/znc
mloc/znc
mogigoma/znc
mokerjoke/znc
nbchicong/znc
nbebout/znc
necrotic/znc
nephaste/znc
notry4n/znc
nta/znc
nullnick/znc
nurupo/znc
nyuszika7h/znc
okket/znc
ollie27/znc
omgjlk/znc
paultcochrane/znc
pepijndevos/znc
pfsmorigo/znc
prodigeni/znc
psychon/znc
ravomavain/znc
reality/znc
reedloden/znc
rememberedbound/znc
reuben/znc
rickza/znc
robinosan/znc
ru108/znc
rwaldron/znc
schoentoon/znc
sdamashek/znc
sebageek/znc
sgaist/znc
sixstringsg/znc
somasonic/znc
sorbits/znc
specing/znc
stephank/znc
swarfega/znc
techalchemy/znc
templed/znc
thomasf/znc
toddhainsworth/znc
toydestroyer/znc
trisk/znc
tzvetkoff/znc
umorigu/znc
uu1101/znc
vincentbernat/znc
viric/znc
vodik/znc
vrcsix/znc
wchristian/znc
wired/znc
wkonkel/znc
ydin-zz/znc
ylfchild/znc
yuvipanda/znc
zhangshiguang/znc
Nothing to show
Choose a head branch
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 50 additions and 32 deletions.
  1. +9 −2 .travis-generate-docs.sh
  2. +1 −1 Makefile.in
  3. +40 −29 make-tarball.sh
View
@@ -21,10 +21,17 @@ git config --global user.name "travis-ci"
git clone --branch=gh-pages znc-docs:znc/docs.git gh-pages || exit 1
cd gh-pages
-git rm -rf *
+git rm -rf .
+
cp -rf "$TRAVIS_BUILD_DIR"/doc/html/* ./ || exit 1
+echo docs.znc.in > CNAME
+
git add .
-git commit -m "Latest docs on successful travis build $TRAVIS_BUILD_NUMBER (commit $TRAVIS_REPO_SLUG/$TRAVIS_COMMIT) auto-pushed to gh-pages"
+git commit -F- <<EOF
+Latest docs on successful travis build $TRAVIS_BUILD_NUMBER
+
+ZNC commit $TRAVIS_REPO_SLUG/$TRAVIS_COMMIT
+EOF
git push origin gh-pages
echo "Published docs to gh-pages."
View
@@ -144,7 +144,7 @@ $(GTEST_DIR)/src/gtest-all.cc $(GTEST_DIR)/src/gtest_main.cc $(GTEST_DIR)/includ
$(Q)touch -c $@
endif
-ifneq "THIS_IS_NOT_NIGHTLY" ""
+ifneq "THIS_IS_NOT_TARBALL" ""
# If git commit was changed since previous build, add a phony target to dependencies, forcing version.o to be recompiled
# Nightlies have pregenerated version.cpp
src/version.cpp: Makefile version.sh $(shell if [ x`cat .version_extra 2> /dev/null` != x`$(srcdir)/version.sh $(GIT) 2> /dev/null` ]; then echo version_extra_recompile; fi)
View
@@ -2,56 +2,67 @@
set -e
TMPDIR=`mktemp -d`
-VERSION=$1
-
trap 'rm -rf $TMPDIR' EXIT
if [ ! -f include/znc/main.h ] ; then
echo "Can't find source!"
exit -1
fi
-if [ "x$VERSION" = "x" ] ; then
- AWK_ARG='/#define VERSION_MAJOR/ { maj = $3 }
- /#define VERSION_MINOR/ { min = $3 }
- END { printf "%.1f", (maj + min / 10) }'
- VERSION=$(awk "$AWK_ARG" include/znc/main.h)
-fi
-if [ "x$VERSION" = "x" ] ; then
- echo "Couldn't get version number"
- exit -1
+if [ "x$1" = "x--nightly" ]; then
+ # e.g. ./make-tarball.sh --nightly znc-git-2014-04-21 path/to/output/znc-foo.tar.gz
+ ZNCDIR=$2
+ TARGZ=$3
+ SIGN=0
+ DESC=-nightly-`date +%Y%m%d`-`git $GITDIR rev-parse HEAD | cut -b-8`
+else
+ VERSION=$1
+ if [ "x$VERSION" = "x" ] ; then
+ AWK_ARG='/#define VERSION_MAJOR/ { maj = $3 }
+ /#define VERSION_MINOR/ { min = $3 }
+ END { printf "%.1f", (maj + min / 10) }'
+ VERSION=$(awk "$AWK_ARG" include/znc/main.h)
+ fi
+ if [ "x$VERSION" = "x" ] ; then
+ echo "Couldn't get version number"
+ exit -1
+ fi
+
+ ZNCDIR=znc-$VERSION
+ TARGZ=$ZNCDIR.tar.gz
+ SIGN=1
+ DESC=""
+ # DESC="-rc1"
fi
-ZNC=znc-$VERSION
-TAR=$ZNC.tar
-TARGZ=$TAR.gz
+TARGZ=`realpath $TARGZ`
-echo "Exporting . to $TMPDIR/$ZNC..."
-git checkout-index --all --prefix=$TMPDIR/$ZNC/
+echo "Exporting . to $TMPDIR/$ZNCDIR..."
+git checkout-index --all --prefix=$TMPDIR/$ZNCDIR/
(
- cd $TMPDIR/$ZNC
+ cd $TMPDIR/$ZNCDIR
echo "Generating configure"
AUTOMAKE_FLAGS="--add-missing --copy" ./autogen.sh
rm -r autom4te.cache/
mkdir -p modules/.depend
- make -C modules -f modperl/Makefile.gen srcdir=. SWIG=/usr/bin/swig
- make -C modules -f modpython/Makefile.gen srcdir=. SWIG=/usr/bin/swig
- rm -fr modules/.depend
+ make -C modules -f modperl/Makefile.gen srcdir=. SWIG=/usr/bin/swig PERL=/usr/bin/perl
+ make -C modules -f modpython/Makefile.gen srcdir=. SWIG=/usr/bin/swig PERL=/usr/bin/perl
+ rm -f modules/.depend
rm .travis*
rm make-tarball.sh
- sed -e "s/THIS_IS_NOT_NIGHTLY//" -i Makefile.in
+ sed -e "s/THIS_IS_NOT_TARBALL//" -i Makefile.in
echo '#include <znc/version.h>' > src/version.cpp
- echo "const char* ZNC_VERSION_EXTRA = \"-rc1\";" >> src/version.cpp
- # "rc1" part is to be fixed later
+ echo "const char* ZNC_VERSION_EXTRA = \"$DESC\";" >> src/version.cpp
)
(
cd $TMPDIR
echo "Creating tarball"
- tar -cf $TAR $ZNC
- gzip -9 $TAR
+ env GZIP=-9 tar -czf $TARGZ $ZNCDIR
)
echo "Done"
-mv $TMPDIR/$TARGZ .
-echo "Signing $TARGZ..."
-gpg --detach-sig $TARGZ
-echo "Created $TARGZ and $TARGZ.sig"
+
+if [ $SIGN = 1 ]; then
+ echo "Signing $TARGZ..."
+ gpg --detach-sig $TARGZ
+ echo "Created $TARGZ and $TARGZ.sig"
+fi

No commit comments for this range