X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fimages%2FMakefile.am;h=46eb1e64e6281add944badc474cf01c4ddab108c;hb=25328bfe03255756921ee3a8aba2a6e37a7955fe;hp=4277cdb3cc1261cf342ae80ce7d3462af3f93c99;hpb=8bf96a69b3491585dc1b1972521de4b6e48e7687;p=synfig.git

diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am
index 4277cdb..46eb1e6 100644
--- a/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@ -6,28 +6,20 @@ EXT = @imageext@
 EXTRA_DIST = \
 	installer_logo.sif \
 	installer_logo_osx.sif \
-	splash_screen1.sif \
-	splash_screen2.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 \
 	about_icon.sif \
-	canvas_icon.sif \
-	children_icon.sif \
 	clear_redo_icon.sif \
 	clear_undo_icon.sif \
 	curves_icon.sif \
 	duplicate_icon.sif \
 	encapsulate_icon.sif \
-	group_icon.sif \
-	info_icon.sif \
-	keyframe_icon.sif \
 	keyframe_lock_icon.sif \
-	layer_icon.sif \
 	logo.sif \
-	meta_data_icon.sif \
-	navigator_icon.sif \
 	pastecanvas_icon.sif \
 	saveall_icon.sif \
 	select_all_child_layers_icon.sif \
@@ -36,7 +28,6 @@ EXTRA_DIST = \
 	swap_colors_icon.sif \
 	synfig_icon.sif \
 	synfig_icon.svg \
-	time_track_icon.sif \
 	valuenode_icon.sif \
 	wallpaper.sif \
 	rename_icon.sif \
@@ -65,6 +56,7 @@ EXTRA_DIST = \
 	action_remove_from_group_icon.sif \
 	action_export_icon.sif \
 	action_unexport_icon.sif
+	\
 	layer_blur_blur_icon.sif \
 	layer_blur_motion_icon.sif \
 	layer_blur_radial_icon.sif \
@@ -112,6 +104,7 @@ EXTRA_DIST = \
 	layer_transform_rotate_icon.sif \
 	layer_transform_translate_icon.sif \
 	layer_transform_zoom_icon.sif \
+	\
 	tool_bline_icon.sif \
 	tool_circle_icon.sif \
 	tool_draw_icon.sif \
@@ -130,6 +123,7 @@ EXTRA_DIST = \
 	tool_text_icon.sif \
 	tool_width_icon.sif \
 	tool_zoom_icon.sif \
+	\
 	type_angle_icon.sif \
 	type_blinepoint_icon.sif \
 	type_bool_icon.sif \
@@ -142,23 +136,28 @@ EXTRA_DIST = \
 	type_segment_icon.sif \
 	type_string_icon.sif \
 	type_time_icon.sif \
-	type_vector_icon.sif
-
+	type_vector_icon.sif \
+	\
+	canvas_icon.sif \
+	children_icon.sif \
+	curves_icon.sif \
+	group_icon.sif \
+	history_icon.sif \
+	info_icon.sif \
+	keyframe_icon.sif \
+	layer_icon.sif \
+	meta_data_icon.sif \
+	navigator_icon.sif \
+	palette_icon.sif \
+	params_icon.sif \
+	time_track_icon.sif
 
 IMAGES = \
 	installer_logo.$(EXT) \
 	installer_logo_osx.$(EXT) \
-	time_track_icon.$(EXT) \
-	curves_icon.$(EXT) \
 	pastecanvas_icon.$(EXT) \
-	group_icon.$(EXT) \
 	clear_redo_icon.$(EXT) \
 	clear_undo_icon.$(EXT) \
-	navigator_icon.$(EXT) \
-	info_icon.$(EXT) \
-	meta_data_icon.$(EXT) \
-	children_icon.$(EXT) \
-	keyframe_icon.$(EXT) \
 	reset_colors_icon.$(EXT) \
 	swap_colors_icon.$(EXT) \
 	select_all_child_layers_icon.$(EXT) \
@@ -166,11 +165,8 @@ IMAGES = \
 	synfig_icon.$(EXT) \
 	saveall_icon.$(EXT) \
 	about_icon.$(EXT) \
-	splash_screen1.$(EXT) \
-	splash_screen2.$(EXT) \
-	canvas_icon.$(EXT) \
+	splash_screen.$(EXT) \
 	valuenode_icon.$(EXT) \
-	layer_icon.$(EXT) \
 	duplicate_icon.$(EXT) \
 	encapsulate_icon.$(EXT) \
 	keyframe_lock_all.$(EXT) \
@@ -203,6 +199,7 @@ IMAGES = \
 	action_remove_from_group_icon.$(EXT) \
 	action_export_icon.$(EXT) \
 	action_unexport_icon.$(EXT) \
+	\
 	layer_blur_blur_icon.$(EXT) \
 	layer_blur_motion_icon.$(EXT) \
 	layer_blur_radial_icon.$(EXT) \
@@ -250,6 +247,7 @@ IMAGES = \
 	layer_transform_rotate_icon.$(EXT) \
 	layer_transform_translate_icon.$(EXT) \
 	layer_transform_zoom_icon.$(EXT) \
+	\
 	tool_bline_icon.$(EXT) \
 	tool_circle_icon.$(EXT) \
 	tool_draw_icon.$(EXT) \
@@ -268,6 +266,7 @@ IMAGES = \
 	tool_text_icon.$(EXT) \
 	tool_width_icon.$(EXT) \
 	tool_zoom_icon.$(EXT) \
+	\
 	type_angle_icon.$(EXT) \
 	type_blinepoint_icon.$(EXT) \
 	type_bool_icon.$(EXT) \
@@ -280,8 +279,21 @@ IMAGES = \
 	type_segment_icon.$(EXT) \
 	type_string_icon.$(EXT) \
 	type_time_icon.$(EXT) \
-	type_vector_icon.$(EXT)
-
+	type_vector_icon.$(EXT) \
+	\
+	canvas_icon.$(EXT) \
+	children_icon.$(EXT) \
+	curves_icon.$(EXT) \
+	group_icon.$(EXT) \
+	history_icon.$(EXT) \
+	info_icon.$(EXT) \
+	keyframe_icon.$(EXT) \
+	layer_icon.$(EXT) \
+	meta_data_icon.$(EXT) \
+	navigator_icon.$(EXT) \
+	palette_icon.$(EXT) \
+	params_icon.$(EXT) \
+	time_track_icon.$(EXT)
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
@@ -361,6 +373,19 @@ keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif
 	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