null+****@clear*****
null+****@clear*****
2011年 5月 6日 (金) 11:21:31 JST
Kouhei Sutou 2011-05-06 02:21:31 +0000 (Fri, 06 May 2011)
New Revision: 0640117ce269a3364bd298214fba9c0d12009c41
Log:
admin_html -> html/admin.
Added files:
data/html/Makefile.am
Removed files:
resource/Makefile.am
Modified files:
Makefile.am
configure.ac
data/Makefile.am
mkmfwin32.vbs
Renamed files:
data/html/admin/css/admin.css
(from resource/admin_html/css/admin.css)
data/html/admin/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
(from resource/admin_html/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png)
data/html/admin/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
(from resource/admin_html/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png)
data/html/admin/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
(from resource/admin_html/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png)
data/html/admin/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
(from resource/admin_html/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png)
data/html/admin/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
(from resource/admin_html/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png)
data/html/admin/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
(from resource/admin_html/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png)
data/html/admin/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
(from resource/admin_html/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png)
data/html/admin/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
(from resource/admin_html/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png)
data/html/admin/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
(from resource/admin_html/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png)
data/html/admin/css/ui-lightness/images/ui-icons_222222_256x240.png
(from resource/admin_html/css/ui-lightness/images/ui-icons_222222_256x240.png)
data/html/admin/css/ui-lightness/images/ui-icons_228ef1_256x240.png
(from resource/admin_html/css/ui-lightness/images/ui-icons_228ef1_256x240.png)
data/html/admin/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
(from resource/admin_html/css/ui-lightness/images/ui-icons_ef8c08_256x240.png)
data/html/admin/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
(from resource/admin_html/css/ui-lightness/images/ui-icons_ffd27a_256x240.png)
data/html/admin/css/ui-lightness/images/ui-icons_ffffff_256x240.png
(from resource/admin_html/css/ui-lightness/images/ui-icons_ffffff_256x240.png)
data/html/admin/css/ui-lightness/jquery-ui-1.8.1.custom.css
(from resource/admin_html/css/ui-lightness/jquery-ui-1.8.1.custom.css)
data/html/admin/images/groonga.png
(from resource/admin_html/images/groonga.png)
data/html/admin/images/loading.gif
(from resource/admin_html/images/loading.gif)
data/html/admin/index.html
(from resource/admin_html/index.html)
data/html/admin/js/jquery-1.4.2.min.js
(from resource/admin_html/js/jquery-1.4.2.min.js)
data/html/admin/js/jquery-ui-1.8.1.custom.min.js
(from resource/admin_html/js/jquery-ui-1.8.1.custom.min.js)
data/html/admin/js/jquery.json-2.2.min.js
(from resource/admin_html/js/jquery.json-2.2.min.js)
Modified: Makefile.am (+0 -1)
===================================================================
--- Makefile.am 2011-05-03 14:06:53 +0000 (6154e9a)
+++ Makefile.am 2011-05-06 02:21:31 +0000 (65add8c)
@@ -13,7 +13,6 @@ SUBDIRS = \
rpm \
yum \
data \
- resource \
tools \
doc
#dist_data_DATA =
Modified: configure.ac (+3 -3)
===================================================================
--- configure.ac 2011-05-03 14:06:53 +0000 (dd076b4)
+++ configure.ac 2011-05-06 02:21:31 +0000 (c6f3390)
@@ -116,11 +116,11 @@ AC_CONFIG_FILES([Makefile
rpm/fedora/Makefile
yum/Makefile
data/Makefile
+ data/html/Makefile
data/munin/Makefile
data/init.d/Makefile
data/init.d/redhat/Makefile
data/init.d/redhat/sysconfig/Makefile
- resource/Makefile
tools/Makefile
doc/Makefile
doc/ja/Makefile
@@ -798,8 +798,8 @@ GRN_DEFS=""
GRN_DEFS="$GRN_DEFS -DGRN_PLUGINS_DIR=\\\"\"\$(pluginsdir)\"\\\""
GRN_DEFS="$GRN_DEFS -DGRN_RELATIVE_PLUGINS_DIR=\\\"\"lib/\$(relative_pluginsdir)\"\\\""
GRN_DEFS="$GRN_DEFS -DGRN_LOG_PATH=\\\"\"\$(grn_log_path)\"\\\""
-GRN_DEFS="$GRN_DEFS -DGRN_DEFAULT_DOCUMENT_ROOT=\\\"\"\$(pkgdatadir)/admin_html\"\\\""
-GRN_DEFS="$GRN_DEFS -DGRN_DEFAULT_RELATIVE_DOCUMENT_ROOT=\\\"\"share/\$(PACKAGE)/admin_html\"\\\""
+GRN_DEFS="$GRN_DEFS -DGRN_DEFAULT_DOCUMENT_ROOT=\\\"\"\$(pkgdatadir)/html/admin\"\\\""
+GRN_DEFS="$GRN_DEFS -DGRN_DEFAULT_RELATIVE_DOCUMENT_ROOT=\\\"\"share/\$(PACKAGE)/html/admin\"\\\""
AC_SUBST(GRN_DEFS)
CFLAGS="$CFLAGS $OPT_CFLAGS "
LIBS="$LIBS $ZLIB_LIBS $LZO_LIBS $RT_LIBS $PTHREAD_LIBS $M_LIBS $NSL_LIBS $SOCKET_LIBS $WINDOWS_LIBS"
Modified: data/Makefile.am (+1 -0)
===================================================================
--- data/Makefile.am 2011-05-03 14:06:53 +0000 (f22d86d)
+++ data/Makefile.am 2011-05-06 02:21:31 +0000 (be6899e)
@@ -1,4 +1,5 @@
SUBDIRS = \
+ html \
munin \
init.d
Added: data/html/Makefile.am (+26 -0) 100644
===================================================================
--- /dev/null
+++ data/html/Makefile.am 2011-05-06 02:21:31 +0000 (0b7221d)
@@ -0,0 +1,26 @@
+htmldir = $(pkgdatadir)/html
+
+# find admin -type f | sort | sed -e 's,^,\t,g'
+nobase_dist_html_DATA = \
+ admin/css/admin.css \
+ admin/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png \
+ admin/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png \
+ admin/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png \
+ admin/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png \
+ admin/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \
+ admin/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png \
+ admin/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png \
+ admin/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \
+ admin/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \
+ admin/css/ui-lightness/images/ui-icons_222222_256x240.png \
+ admin/css/ui-lightness/images/ui-icons_228ef1_256x240.png \
+ admin/css/ui-lightness/images/ui-icons_ef8c08_256x240.png \
+ admin/css/ui-lightness/images/ui-icons_ffd27a_256x240.png \
+ admin/css/ui-lightness/images/ui-icons_ffffff_256x240.png \
+ admin/css/ui-lightness/jquery-ui-1.8.1.custom.css \
+ admin/images/groonga.png \
+ admin/images/loading.gif \
+ admin/index.html \
+ admin/js/jquery-1.4.2.min.js \
+ admin/js/jquery-ui-1.8.1.custom.min.js \
+ admin/js/jquery.json-2.2.min.js
Renamed: data/html/admin/css/admin.css (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-icons_222222_256x240.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-icons_228ef1_256x240.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-icons_ef8c08_256x240.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-icons_ffd27a_256x240.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/images/ui-icons_ffffff_256x240.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/css/ui-lightness/jquery-ui-1.8.1.custom.css (+0 -0) 100%
===================================================================
Renamed: data/html/admin/images/groonga.png (+0 -0) 100%
===================================================================
Renamed: data/html/admin/images/loading.gif (+0 -0) 100%
===================================================================
Renamed: data/html/admin/index.html (+0 -0) 100%
===================================================================
Renamed: data/html/admin/js/jquery-1.4.2.min.js (+0 -0) 100%
===================================================================
Renamed: data/html/admin/js/jquery-ui-1.8.1.custom.min.js (+0 -0) 100%
===================================================================
Renamed: data/html/admin/js/jquery.json-2.2.min.js (+0 -0) 100%
===================================================================
Modified: mkmfwin32.vbs (+4 -4)
===================================================================
--- mkmfwin32.vbs 2011-05-03 14:06:53 +0000 (4dfa90d)
+++ mkmfwin32.vbs 2011-05-06 02:21:31 +0000 (25703b0)
@@ -8,14 +8,14 @@ strarch = shell.expandenvironmentstrings("%PROCESSOR_ARCHITECTURE%")
msgbox strarch
-dim PLUGINS_DIR, PLUGINS_DIR2, INSTALL_DIR, LOG_PATH, MECAB_LIB, CONFIG_PATH,DOCUMENT_ROOT, RELATIVE_PLUGINS_DIR
+dim PLUGINS_DIR, PLUGINS_DIR2, INSTALL_DIR, LOG_PATH, MECAB_LIB, CONFIG_PATH, RELATIVE_DOCUMENT_ROOT, RELATIVE_PLUGINS_DIR
INSTALL_DIR = "c:\groonga"
PLUGINS_DIR = "c:\\groonga\\plugins"
PLUGINS_DIR2 = "c:\groonga\plugins"
LOG_PATH = "c:\\groonga\\log\\groonga.log"
MECAB_LIB = "c:\program files\mecab\sdk\libmecab.lib"
CONFIG_PATH ="c:\\groonga\\etc\\config"
-DOCUMENT_ROOT ="c:\\groonga\\data\\admin_html"
+RELATIVE_DOCUMENT_ROOT ="share/groonga/html/admin"
RELATIVE_PLUGINS_DIR = "plugins"
'control warning
@@ -119,8 +119,8 @@ sub common_header()
ts.write CONFIG_PATH
ts.write "\"""" \" + vbLf
- ts.write " -DGRN_DEFAULT_DOCUMENT_ROOT=""\"""
- ts.write DOCUMENT_ROOT
+ ts.write " -DGRN_DEFAULT_RELATIVE_DOCUMENT_ROOT=""\"""
+ ts.write RELATIVE_DOCUMENT_ROOT
ts.write "\"""" \" + vbLf
ts.write " -DPACKAGE=""\"""
Deleted: resource/Makefile.am (+0 -24) 100644
===================================================================
--- resource/Makefile.am 2011-05-03 14:06:53 +0000 (dce2dc5)
+++ /dev/null
@@ -1,24 +0,0 @@
-# find admin_html -type f | sort | sed -e 's,^,\t,g'
-nobase_dist_pkgdata_DATA = \
- admin_html/css/admin.css \
- admin_html/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png \
- admin_html/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png \
- admin_html/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png \
- admin_html/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png \
- admin_html/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \
- admin_html/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png \
- admin_html/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png \
- admin_html/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \
- admin_html/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \
- admin_html/css/ui-lightness/images/ui-icons_222222_256x240.png \
- admin_html/css/ui-lightness/images/ui-icons_228ef1_256x240.png \
- admin_html/css/ui-lightness/images/ui-icons_ef8c08_256x240.png \
- admin_html/css/ui-lightness/images/ui-icons_ffd27a_256x240.png \
- admin_html/css/ui-lightness/images/ui-icons_ffffff_256x240.png \
- admin_html/css/ui-lightness/jquery-ui-1.8.1.custom.css \
- admin_html/images/groonga.png \
- admin_html/images/loading.gif \
- admin_html/index.html \
- admin_html/js/jquery-1.4.2.min.js \
- admin_html/js/jquery-ui-1.8.1.custom.min.js \
- admin_html/js/jquery.json-2.2.min.js