Commit 998bbdb5 authored by Oskar Skog's avatar Oskar Skog

Makefile & mkdist clean ups; Makefile clean ups

parent a64065e8
2016-10-21 Oskar Skog <[email protected]>
0.3.10
* desktop/anonymine.v0.xcf: Gone.
* Makefile.static:
- Was still looking for name suggestions...
- Sections are now clearer.
* mkdist, Makefile.static: Simplify code now when Windows support is
gone.
2016-10-20 Oskar Skog <[email protected]>
0.3.9
......
##############################################################################
# #
# Makefile #
# ======== #
# #
##############################################################################
# If you have a suggestion for a name, tell me about it:
# <[email protected]>
# No quotes for these four:
# NAME = [technical] name
......@@ -34,6 +37,11 @@ PRE_UNINSTALL = true
NORMAL_UNINSTALL = true
POST_UNINSTALL = true
##############################################################################
# #
# all (build) & clean #
# #
##############################################################################
......@@ -114,6 +122,7 @@ build-macosx : FORCE
@python "$(OSX_MK_ICON)" "$(OSX_ICON)" "$(srcdir)desktop/$(NAME)"
clean : FORCE
@rm $(ALL_STAGE) 2> /dev/null || true
@: # Remove the bytecode files.
......@@ -125,6 +134,13 @@ distclean : clean
@rm $(builddir)Makefile
##############################################################################
# #
# install, unininstall & print-destinations #
# #
##############################################################################
# configure.py will choose /usr/ucb/install on Solares.
INSTALL ?= install
......@@ -296,10 +312,18 @@ print-destinations: FORCE
fi
test : check
@true
##############################################################################
# #
# check, dist & release #
# #
##############################################################################
PKG := $(NAME)-$(VERSION)
test : check
@true
check: FORCE
@$(info) "Checking that it works on both snakes... May take a while!"
@$(srcdir)check.sh "$(srcdir)" "$(builddir)"
......@@ -308,7 +332,8 @@ check: FORCE
dist : FORCE
@$(info) "Building tarballs..."
@cd "$(builddir)" && make tarballs > /dev/null
tarballs : FORCE
@$(srcdir)mkdist "$(srcdir)" "$(builddir)" "$(PKG)"
release : dist check
@cp -t ~www-data/archive/"$(NAME)/" "$(PKG).tar.gz" \
......@@ -317,10 +342,8 @@ release : dist check
|| echo You are not me.
PKG := $(NAME)-$(VERSION)
tarballs : FORCE
@$(srcdir)mkdist "$(srcdir)" "$(builddir)" "$(PKG)" tar
##############################################################################
##############################################################################
FORCE:
......@@ -2,11 +2,10 @@
# TODO: This was created to simplify Windows support, it's no longer needed.
# Usage: ./dist srcdir builddir pkgname {zip|tar}
# Usage: ./dist srcdir builddir pkgname
srcdir=$1
builddir=$2
pkgname=$3
type=$4
pkgdir=$builddir$pkgname
NAME="anonymine"
......@@ -27,7 +26,7 @@ mkdir $pkgdir
for subdir in $subdirs; do
mkdir "$pkgdir/$subdir"
done
if [ $type = "tar" ]; then
for f in $textfiles $noconv $files; do
cp "$srcdir$f" "$pkgdir/$f"
done
......@@ -36,18 +35,5 @@ if [ $type = "tar" ]; then
gzip -9 -k "$pkgname.tar" || echo no gzip
xz -9e -k "$pkgname.tar" || echo no xz
rm "$pkgdir.tar"
fi
if [ $type = "zip" ] && [ -n "`which unix2dos`" ]; then
for f in $textfiles; do
unix2dos -q -n "$srcdir$f" "$pkgdir/$f.txt"
done
for f in $files; do
unix2dos -q -n "$srcdir$f" "$pkgdir/$f"
done
for f in $noconv; do
cp "$srcdir$f" "$pkgdir/$f"
done
cd $builddir
zip -rXq "$pkgname.zip" "$pkgname"
fi
rm -r "$pkgdir"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment