Manually merge from latest webber

[oss-web.git] / Makefile

diff --git a/Makefile b/Makefile
index 41e0ebcdad3db64cc65a64d366629e5b68da6ce5..67739841d7384741c6301b24d182c71652c1e265 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 #!/usr/bin/make
 
-deployurl = sysadmin@oss.titaniummirror.com:/var/www/
+server = oss.titaniummirror.com
+deployurl = sysadmin@$(server):/var/www/oss/
 
 all: webber.conf
        ./webber
@@ -8,6 +9,13 @@ all: webber.conf
 profile:
        ./webber --profile
 
+lint:
+       pylint \
+               --include-ids=y \
+               --reports=n \
+               --disable-msg=W0312,C0103 \
+               webber.py plugins
+
 clean:
        rm -f *.pyc plugins/*.pyc
 
@@ -17,6 +25,9 @@ realclean: clean
 deploy:
        rsync -avz --delete out/ $(deployurl)
 
+dry:
+       rsync --dry-run -avz --delete out/ $(deployurl)
+
 # Automatically create webber.conf:
 ifeq ($(wildcard webber.conf),)
 webber.conf: in/webber.conf