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

[noreply at openclipart.org]

Author: rejon
Date: Mon Jun 29 08:20:35 2009
New Revision: 47

Log:
updated to make sure don't overwrite non-day old packages, and other basics

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

Modified: packager/trunk/Makefile
==============================================================================
--- packager/trunk/Makefile	Mon Jun 29 04:29:51 2009	(r46)
+++ packager/trunk/Makefile	Mon Jun 29 08:20:35 2009	(r47)
@@ -35,7 +35,9 @@
 SRCDIR = clipart
 
 DAILY_PACKAGE=http://download.openclipart.org/downloads/daily_SVG_snapshot.tar.bz2
-DAILY_PACKAGE_LOCAL=/tmp/openclipart-daily.tar.bz2
+DAILY_PACKAGE_LOCAL_PATH=/tmp
+DAILY_PACKAGE_LOCAL_NAME=openclipart-daily.tar.bz2
+DAILY_PACKAGE_LOCAL=$(DAILY_PACKAGE_LOCAL_PATH)/$(DAILY_PACKAGE_LOCAL_NAME)
 
 TOOLSDIR= tools
 PACKAGEDIR=packages
@@ -104,17 +106,25 @@
 	# add AUTHORS to the next line to add AUTHORS to the man page
 	cat $(APPNAME).7 | gzip -c > $(APPNAME).7.gz
 
-daily: daily-build
+# add dist to the below when ready
+daily: daily-build gallery 
 
 daily-build:
 ifneq (0, $(shell ls $(SRCDIR) | wc -l))
 	@echo "Remove $(SRCDIR) directory contents first!"
 else
-	wget -O $(DAILY_PACKAGE_LOCAL) $(DAILY_PACKAGE)
+	# check to see if this package exists and if its older than a day, delete
+	$(shell find $(DAILY_PACKAGE_LOCAL_PATH) -daystart -maxdepth 1 -type f -mtime +1 -name $(DAILY_PACKAGE_LOCAL_NAME) -exec rm -Rf {} \;)
+	# if package doesn't exist, then download it
+	if [ ! -e "$(DAILY_PACKAGE_LOCAL)" ]; then \
+		wget -O "$(DAILY_PACKAGE_LOCAL)" "$(DAILY_PACKAGE)"; fi
 	# NEXT unpack the contents to /clipart
 	tar -C $(SRCDIR) -xvjf $(DAILY_PACKAGE_LOCAL)
 endif
 
+gallery:
+	@echo "Generate HTML Previes into the master package before packaging"
+
 # Create release directories ready for packaging
 distprep: all
 	# create package directories
@@ -226,10 +236,6 @@
 	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/nsis/build.nsi
==============================================================================
--- packager/trunk/nsis/build.nsi	Mon Jun 29 04:29:51 2009	(r46)
+++ packager/trunk/nsis/build.nsi	Mon Jun 29 08:20:35 2009	(r47)
@@ -10,7 +10,7 @@
 ; NOTE: Language Translations are generated by external perl script. 
 ; PLEASE SEE README.txt
 ;
-; This is processed and 0.20-SVN is replaced with the version of the app.
+; This is processed and 0.21-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.20-SVN"  ; 100
-!define VER_DISPLAY "0.20-SVN" ; 1.0.0
+!define VER_FILE "0.21-SVN"  ; 100
+!define VER_DISPLAY "0.21-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.20-SVN-win32.exe"
+!define INSTALLER_NAME "..\packages\openclipart-0.21-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.20-SVN-svgonly"
+!define SOURCE_DIR "..\packages\openclipart-0.21-SVN-svgonly"
 !define LICENSES_DIR "Licenses"
 !define IMAGES_DIR "images"
 

Modified: packager/trunk/openclipart.spec
==============================================================================
--- packager/trunk/openclipart.spec	Mon Jun 29 04:29:51 2009	(r46)
+++ packager/trunk/openclipart.spec	Mon Jun 29 08:20:35 2009	(r47)
@@ -1,4 +1,4 @@
-%define buildver 0.20-SVN
+%define buildver 0.21-SVN
 %define specrel 2ark
 
 # CVS versions are pre-releases and must be treated differently than "real"