X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fimages%2FMakefile.am;h=38207042e04a031fd2cbc3da81a8d3d4de50b6fe;hb=961d8b11ca07964cb96baf5a32870cef5d8f62fe;hp=bd2d121e5c518bf3e8f77f55c9cce8844e6e5354;hpb=dfd769933b1ed7108e8a82fc73cc57589b088b4d;p=synfig.git

diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am
index bd2d121..3820704 100644
--- a/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@ -6,12 +6,14 @@ EXT = @imageext@
 EXTRA_DIST = \
 	installer_logo.sif \
 	installer_logo_osx.sif \
-	splash_screen1.sif \
-	splash_screen2.sif \
+	splash_screen-0.62.02.sif\
+	splash_screen-0.62.01.sif \
+	splash_screen-0.62.01-2.sif \
 	splash_screen-0.62.00.sif \
 	splash_screen-0.61.09.sif \
 	splash_screen-0.61.08.sif \
 	splash_screen-0.61.07.sif \
+	splash_screen_development.sif.in \
 	about_icon.sif \
 	clear_redo_icon.sif \
 	clear_undo_icon.sif \
@@ -55,7 +57,7 @@ EXTRA_DIST = \
 	action_add_to_group_icon.sif \
 	action_remove_from_group_icon.sif \
 	action_export_icon.sif \
-	action_unexport_icon.sif
+	action_unexport_icon.sif \
 	\
 	layer_blur_blur_icon.sif \
 	layer_blur_motion_icon.sif \
@@ -165,8 +167,7 @@ IMAGES = \
 	synfig_icon.$(EXT) \
 	saveall_icon.$(EXT) \
 	about_icon.$(EXT) \
-	splash_screen1.$(EXT) \
-	splash_screen2.$(EXT) \
+	splash_screen.$(EXT) \
 	valuenode_icon.$(EXT) \
 	duplicate_icon.$(EXT) \
 	encapsulate_icon.$(EXT) \
@@ -345,7 +346,7 @@ clean-local:
 	$(SYNFIG) -q $< -o $@ --time 0
 
 .sif.$(EXT):
-	$(SYNFIG) -q $< -o $@ --time 0 -w 48 -h 48
+	$(SYNFIG) -q $< -o $@ --time 0
 	echo "  File \"images\\$@\"" >>./images.nsh
 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
 
@@ -355,25 +356,38 @@ clean-local:
 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
 
 keyframe_lock_all.$(EXT): $(srcdir)/keyframe_lock_icon.sif
-	$(SYNFIG) -q $< -o $@ --time 0 -w 48 -h 48
+	$(SYNFIG) -q $< -o $@ --time 0
 	echo "  File \"images\\$@\"" >>./images.nsh
 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
 
 keyframe_lock_past.$(EXT): $(srcdir)/keyframe_lock_icon.sif
-	$(SYNFIG) -q $< -o $@ --time 0 -w 48 -h 48 -c PastOnly
+	$(SYNFIG) -q $< -o $@ --time 0 -c PastOnly
 	echo "  File \"images\\$@\"" >>./images.nsh
 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
 
 keyframe_lock_future.$(EXT): $(srcdir)/keyframe_lock_icon.sif
-	$(SYNFIG) -q $< -o $@ --time 0 -w 48 -h 48 -c FutureOnly
+	$(SYNFIG) -q $< -o $@ --time 0 -c FutureOnly
 	echo "  File \"images\\$@\"" >>./images.nsh
 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
 
 keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif
-	$(SYNFIG) -q $< -o $@ --time 0 -w 48 -h 48 -c Disabled
+	$(SYNFIG) -q $< -o $@ --time 0 -c Disabled
 	echo "  File \"images\\$@\"" >>./images.nsh
 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
 
+if DEVELOPMENT_SNAPSHOT
+splash_screen_development.sif: $(srcdir)/splash_screen_development.sif.in
+	export commit_id=`git log --no-color -1 | head -n 1 | cut -f 2 -d ' ' | cut -c -6` && \
+	export commit_date=`git show --pretty=format:%ci HEAD |  head -c 10` && \
+	export branch=`git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//` && \
+	export branch=`echo $$branch | egrep origin/master > /dev/null && echo master || echo $$branch | cut -d ' ' -f 1 | sed -e 's/.*\///'` && \
+	sed "s|%branch%|$$branch|" $< | sed "s|%commit_date%|$$commit_date|" | sed "s|%commit_id%|$$commit_id|" > $@
+splash_screen.$(EXT): $(srcdir)/splash_screen_development.sif
+	$(SYNFIG) -q $< -o $@ --time 0
+else
+splash_screen.$(EXT): $(srcdir)/splash_screen-$(PACKAGE_VERSION).sif
+	$(SYNFIG) -q $< -o $@ --time 0
+endif
 
 if !WIN32_PKG
 if !MACOSX_PKG