[Groonga-commit] groonga/groonga [master] html: support auto target files generation

Back to archive index

null+****@clear***** null+****@clear*****
2012年 4月 16日 (月) 22:32:56 JST


Kouhei Sutou	2012-04-16 22:32:56 +0900 (Mon, 16 Apr 2012)

  New Revision: a4b7b97d49024aa3924031c19ed11168a8dcb4f5

  Log:
    html: support auto target files generation

  Added files:
    data/html/nobase_html_files.am
    data/html/update-files.sh
  Modified files:
    Makefile.am
    data/html/Makefile.am

  Modified: Makefile.am (+4 -0)
===================================================================
--- Makefile.am    2012-04-16 22:21:54 +0900 (e856107)
+++ Makefile.am    2012-04-16 22:32:56 +0900 (9a88ef7)
@@ -126,3 +126,7 @@ update-version:
 	  exit 1;				\
 	fi
 	@echo -n $(NEW_VERSION) > $(srcdir)/base_version
+
+update-files:
+	cd doc && $(MAKE) update-files
+	cd data/html && $(MAKE) update-files

  Modified: data/html/Makefile.am (+4 -32)
===================================================================
--- data/html/Makefile.am    2012-04-16 22:21:54 +0900 (823c27f)
+++ data/html/Makefile.am    2012-04-16 22:32:56 +0900 (e002adf)
@@ -1,34 +1,6 @@
 htmldir = $(pkgdatadir)/html
 
-# find admin -type f | sort | sed -e 's,^,\t,g'
-nobase_dist_html_DATA =							\
-	admin/css/groonga-admin.css					\
-	admin/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png		\
-	admin/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png	\
-	admin/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png	\
-	admin/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png	\
-	admin/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png	\
-	admin/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png	\
-	admin/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png	\
-	admin/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png	\
-	admin/css/redmond/images/ui-icons_217bc0_256x240.png		\
-	admin/css/redmond/images/ui-icons_2e83ff_256x240.png		\
-	admin/css/redmond/images/ui-icons_469bdd_256x240.png		\
-	admin/css/redmond/images/ui-icons_6da8d5_256x240.png		\
-	admin/css/redmond/images/ui-icons_cd0a0a_256x240.png		\
-	admin/css/redmond/images/ui-icons_d8e7f3_256x240.png		\
-	admin/css/redmond/images/ui-icons_f9bd01_256x240.png		\
-	admin/css/redmond/jquery-ui-1.8.18.custom.css			\
-	admin/favicon.ico						\
-	admin/favicon.png						\
-	admin/favicon.svg						\
-	admin/images/groonga.png					\
-	admin/images/groonga.svg					\
-	admin/images/loading.gif					\
-	admin/index.html						\
-	admin/js/groonga-admin.js					\
-	admin/js/jquery-1.7.2.min.js					\
-	admin/js/jquery-ui-1.8.18.custom.min.js				\
-	admin/js/jquery.flot-0.7.min.js					\
-	admin/js/jquery.flot.license.txt				\
-	admin/js/jquery.json-2.2.min.js
+include nobase_html_files.am
+
+update-files:
+	cd $(srcdir); ./update-files.sh > nobase_html_files.am

  Added: data/html/nobase_html_files.am (+33 -0) 100644
===================================================================
--- /dev/null
+++ data/html/nobase_html_files.am    2012-04-16 22:32:56 +0900 (6385392)
@@ -0,0 +1,33 @@
+nobase_html_files.am = \
+	admin/css/groonga-admin.css \
+	admin/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png \
+	admin/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png \
+	admin/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png \
+	admin/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png \
+	admin/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png \
+	admin/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png \
+	admin/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png \
+	admin/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png \
+	admin/css/redmond/images/ui-icons_217bc0_256x240.png \
+	admin/css/redmond/images/ui-icons_2e83ff_256x240.png \
+	admin/css/redmond/images/ui-icons_469bdd_256x240.png \
+	admin/css/redmond/images/ui-icons_6da8d5_256x240.png \
+	admin/css/redmond/images/ui-icons_cd0a0a_256x240.png \
+	admin/css/redmond/images/ui-icons_d8e7f3_256x240.png \
+	admin/css/redmond/images/ui-icons_f9bd01_256x240.png \
+	admin/css/redmond/jquery-ui-1.8.18.custom.css \
+	admin/favicon.ico \
+	admin/favicon.png \
+	admin/favicon.svg \
+	admin/images/groonga.png \
+	admin/images/groonga.svg \
+	admin/images/loading.gif \
+	admin/index.html \
+	admin/js/groonga-admin.js \
+	admin/js/jquery-1.7.2.min.js \
+	admin/js/jquery-ui-1.8.18.custom.min.js \
+	admin/js/jquery.flot-0.7.min.js \
+	admin/js/jquery.flot.license.txt \
+	admin/js/jquery.json-2.2.min.js \
+	$(NULL)
+

  Added: data/html/update-files.sh (+17 -0) 100755
===================================================================
--- /dev/null
+++ data/html/update-files.sh    2012-04-16 22:32:56 +0900 (a806085)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+list_paths()
+{
+    variable_name=$1
+    echo "$variable_name = \\"
+    sort | \
+    sed \
+      -e 's,^,\t,' \
+      -e 's,$, \\,'
+    echo "\t\$(NULL)"
+    echo
+}
+
+find "admin" -type f | \
+    sort | \
+    list_paths "nobase_html_files.am"




Groonga-commit メーリングリストの案内
Back to archive index