[Clipart] r46 - in packager/trunk: . nsis

[noreply at openclipart.org]

Author: rejon
Date: Mon Jun 29 04:29:51 2009
New Revision: 46

Log:
added some lovely additions to the makefile to do grab of latest clipart

Modified:
   packager/trunk/Makefile
   packager/trunk/VERSION
   packager/trunk/nsis/build.nsi
   packager/trunk/openclipart.spec

Modified: packager/trunk/Makefile
==============================================================================
--- packager/trunk/Makefile	Sun Jun 28 09:42:02 2009	(r45)
+++ packager/trunk/Makefile	Mon Jun 29 04:29:51 2009	(r46)
@@ -1,7 +1,7 @@
 #
 # Makefile for openclipart packages
 #
-# Copyright 2005, Jon Phillips.
+# Copyright 2005-2009, Jon Phillips.
 #
 # It is quite basic. But getting more complex by the day.
 #
@@ -33,6 +33,10 @@
 APPNAME = openclipart
 FULLNAME= Open Clip Art Library
 SRCDIR = clipart
+
+DAILY_PACKAGE=http://download.openclipart.org/downloads/daily_SVG_snapshot.tar.bz2
+DAILY_PACKAGE_LOCAL=/tmp/openclipart-daily.tar.bz2
+
 TOOLSDIR= tools
 PACKAGEDIR=packages
 
@@ -100,10 +104,19 @@
 	# add AUTHORS to the next line to add AUTHORS to the man page
 	cat $(APPNAME).7 | gzip -c > $(APPNAME).7.gz
 
+daily: daily-build
+
+daily-build:
+ifneq (0, $(shell ls $(SRCDIR) | wc -l))
+	@echo "Remove $(SRCDIR) directory contents first!"
+else
+	wget -O $(DAILY_PACKAGE_LOCAL) $(DAILY_PACKAGE)
+	# NEXT unpack the contents to /clipart
+	tar -C $(SRCDIR) -xvjf $(DAILY_PACKAGE_LOCAL)
+endif
 
 # Create release directories ready for packaging
 distprep: all
-
 	# create package directories
 	rm -rf $(PACK_PREP_FULL_DIR) $(PACK_PREP_SVG_DIR) $(PACK_PREP_TOOLS_DIR)
 	install -m 755 -d $(PACK_PREP_FULL_DIR)
@@ -128,6 +141,10 @@
 	find $(PACK_PREP_FULL_DIR) $(PACK_PREP_SVG_DIR) $(PACK_PREP_TOOLS_DIR) \
 		-depth -name CVS -type d -exec rm -rf {} \;
 
+	# NUKE svn
+	find $(PACK_PREP_FULL_DIR) $(PACK_PREP_SVG_DIR) $(PACK_PREP_TOOLS_DIR) \
+		-depth -name .svn -type d -exec rm -rf {} \;
+
 	# Get rid of non-svg files from SVG directory
 	find $(PACK_PREP_SVG_DIR)/$(SRCDIR) \( -name '*.*' -not -name '*svg' \)\
 		-type f -exec rm -f {} \;
@@ -209,6 +226,10 @@
 	zip-svgonly tarball-svgonly bzip-svgonly \
 	zip-tools tarball-tools bzip-tools
 
+dist-daily: all zip tarball bzip \
+	zip-svgonly tarball-svgonly bzip-svgonly \
+	zip-tools tarball-tools bzip-tools
+
 test:
 	@echo "RELEASE_NUM: $(RELEASE_NUM)"
 	@echo "APPNAME: $(APPNAME)"

Modified: packager/trunk/VERSION
==============================================================================
--- packager/trunk/VERSION	Sun Jun 28 09:42:02 2009	(r45)
+++ packager/trunk/VERSION	Mon Jun 29 04:29:51 2009	(r46)
@@ -1 +1 @@
-0.20-SVN
+0.21-SVN

Modified: packager/trunk/nsis/build.nsi
==============================================================================
--- packager/trunk/nsis/build.nsi	Sun Jun 28 09:42:02 2009	(r45)
+++ packager/trunk/nsis/build.nsi	Mon Jun 29 04:29:51 2009	(r46)
@@ -10,7 +10,7 @@
 ; NOTE: Language Translations are generated by external perl script. 
 ; PLEASE SEE README.txt
 ;
-; This is processed and 0.18CVS is replaced with the version of the app.
+; This is processed and 0.20-SVN is replaced with the version of the app.
 ;
 ;--------------------------------
 ; CONSTANTS
@@ -24,21 +24,21 @@
 ;!define VER_FILE "${VER_MAJOR}${VER_MINOR}${VER_REVISION}"  ; 100
 ;!define VER_DISPLAY "${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}" ; 1.0.0
 
-!define VER_FILE "0.18CVS"  ; 100
-!define VER_DISPLAY "0.18CVS" ; 1.0.0
+!define VER_FILE "0.20-SVN"  ; 100
+!define VER_DISPLAY "0.20-SVN" ; 1.0.0
 
 !define APP_NAME "openclipart"
 !define APP_EXE ""
 ;!define openclipart "Open Clip Art Library"
 ;!define Open Clip Art Library openclipart
-!define INSTALLER_NAME "..\packages\openclipart-0.18CVS-win32.exe"
+!define INSTALLER_NAME "..\packages\openclipart-0.20-SVN-win32.exe"
 
 !define REG_KEY "Content\openclipart"
 
 !define PROJECT_URL "http://www.openclipartlibrary.org/"
 
 !define INSTALL_DIR "$PROGRAMFILES\Open Clip Art Library"
-!define SOURCE_DIR "..\packages\openclipart-0.18CVS-svgonly"
+!define SOURCE_DIR "..\packages\openclipart-0.20-SVN-svgonly"
 !define LICENSES_DIR "Licenses"
 !define IMAGES_DIR "images"
 

Modified: packager/trunk/openclipart.spec
==============================================================================
--- packager/trunk/openclipart.spec	Sun Jun 28 09:42:02 2009	(r45)
+++ packager/trunk/openclipart.spec	Mon Jun 29 04:29:51 2009	(r46)
@@ -1,4 +1,4 @@
-%define buildver 0.18CVS
+%define buildver 0.20-SVN
 %define specrel 2ark
 
 # CVS versions are pre-releases and must be treated differently than "real"