Permalink
Browse files

Merged trunk changes 7794-7888. Will tag trunk/dev_ajax-7888.

  • Loading branch information...
2 parents 310c74e + 61d54b0 commit bdafec0af26adf39968b52057ea2d97a3d753caa Marshall Roch committed Dec 4, 2006
Showing with 17,943 additions and 1,548 deletions.
  1. +42 −34 Makefile
  2. +19 −16 bin/bric_queued
  3. +25 −0 comp/help/bo/about.html
  4. +25 −0 comp/help/de_de/about.html
  5. +26 −0 comp/help/en_us/about.html
  6. +25 −0 comp/help/it_it/about.html
  7. +25 −0 comp/help/ja/about.html
  8. +25 −0 comp/help/km/about.html
  9. +25 −0 comp/help/ko_ko/about.html
  10. +25 −0 comp/help/lo/about.html
  11. +25 −0 comp/help/my/about.html
  12. +25 −0 comp/help/pt_pt/about.html
  13. +25 −0 comp/help/ru_ru/about.html
  14. +25 −0 comp/help/ug/about.html
  15. +25 −0 comp/help/vi_vn/about.html
  16. +25 −0 comp/help/zh_cn/about.html
  17. +25 −0 comp/help/zh_hk/about.html
  18. +25 −0 comp/help/zh_tw/about.html
  19. +7 −8 comp/login/welcome.html
  20. +1 −1 comp/widgets/container_prof/edit_related_media.html
  21. +10 −2 comp/widgets/desk/desk.mc
  22. +0 −3 comp/widgets/desk/desk_top.html
  23. +3 −0 comp/widgets/help/debuggers.html
  24. +1 −0 comp/widgets/help/patchers.html
  25. +0 −5 comp/widgets/search/story.html
  26. +3 −7 comp/workflow/manager/dhandler
  27. +1 −2 comp/workflow/profile/media/container/edit_related_media.html
  28. +5 −5 conf/bricolage.conf
  29. +1 −1 contrib/bric_media_upload/bric_media_upload
  30. +76 −0 contrib/start_scripts/freebsd
  31. +25 −4 contrib/start_scripts/linux
  32. +1 −2 inst/apache.pl
  33. +15 −9 inst/clone.pl
  34. +4 −4 inst/clone_lightweight.pl
  35. +5 −17 inst/clone_sql.pl
  36. +69 −0 inst/clone_sql_Pg.pl
  37. +55 −0 inst/clone_sql_mysql.pl
  38. +9 −8 inst/conf.pl
  39. +4 −4 inst/cpan.pl
  40. +75 −0 inst/database.pl
  41. +10 −155 inst/db.pl
  42. +112 −0 inst/db_uninst_Pg.pl
  43. +97 −0 inst/db_uninst_mysql.pl
  44. +12 −74 inst/db_uninstall.pl
  45. +28 −13 inst/db_upgrade.pl
  46. +50 −0 inst/dbgrant.pl
  47. +16 −16 inst/{db_grant.pl → dbgrant_Pg.pl}
  48. +84 −0 inst/dbgrant_mysql.pl
  49. +196 −0 inst/dbload_Pg.pl
  50. +182 −0 inst/dbload_mysql.pl
  51. +40 −37 inst/{postgres.pl → dbprobe_Pg.pl}
  52. +176 −0 inst/dbprobe_mysql.pl
  53. +33 −1 inst/defaults/freebsd
  54. +33 −2 inst/defaults/gentoo
  55. +32 −1 inst/defaults/standard
  56. +5 −1 inst/dev.pl
  57. +62 −0 inst/dist_sql.pl
  58. +9 −1 inst/lib/Bric/Inst.pm
  59. +10 −3 inst/modules.pl
  60. +99 −3 inst/required.pl
  61. +13 −1 inst/upgrade.pl
  62. +39 −0 inst/upgrade/1.10.3/fix_asset_fk_constraints.pl
  63. +19 −0 inst/upgrade/1.10.3/fix_asset_sort_opts.pl
  64. +12 −0 inst/upgrade/1.10.3/fix_contri_assoc.pl
  65. +24 −0 inst/upgrade/1.11.0/change_aggregate_name_Pg.pl
  66. +30 −0 inst/upgrade/1.8.2/add_missing_job_fks.pl
  67. +14 −2 inst/upgrade/1.8.9/fix_publish_status.pl
  68. +7 −4 inst/upgrade/1.9.1/normalize_et_data.pl
  69. +4 −381 inst/upgrade/lib/bric_upgrade.pm
  70. +679 −0 inst/upgrade/lib/bric_upgrade_Pg.pm
  71. +637 −0 inst/upgrade/lib/bric_upgrade_mysql.pm
  72. +2 −1 inst/versions.txt
  73. +6 −4 lib/Bric/Admin.pod
  74. +24 −6 lib/Bric/App/ApacheConfig.pm
  75. +4 −3 lib/Bric/App/ApacheStartup.pm
  76. +4 −4 lib/Bric/App/Callback/ContainerProf.pm
  77. +3 −0 lib/Bric/App/Callback/Profile/Story.pm
  78. +5 −4 lib/Bric/App/Callback/Profile/Template.pm
  79. +1 −0 lib/Bric/App/Callback/Search.pm
  80. +3 −0 lib/Bric/App/Handler.pm
  81. +27 −27 lib/Bric/App/PreviewHandler.pm
  82. +1 −0 lib/Bric/Biz/Asset/Business.pm
  83. +5 −3 lib/Bric/Biz/Asset/Business/Media.pm
  84. +8 −8 lib/Bric/Biz/Asset/Business/Story.pm
  85. +5 −3 lib/Bric/Biz/Asset/Template.pm
  86. +1 −0 lib/Bric/Biz/AssetType.pm
  87. +3 −1 lib/Bric/Biz/Category.pm
  88. +64 −6 lib/Bric/Biz/Element/Container.pm
  89. +2 −2 lib/Bric/Biz/ElementType/Parts/FieldType.pm
  90. +5 −1 lib/Bric/Biz/Person.pm
  91. +198 −7 lib/Bric/Changes.pod
  92. +1 −1 lib/Bric/Config.pm
  93. +20 −6 lib/Bric/DBA.pod
  94. +8 −8 lib/Bric/Dist/Handler.pm
  95. +10 −6 lib/Bric/Dist/Resource.pm
  96. +7 −7 lib/Bric/License.pod
  97. +1 −2 lib/Bric/SOAP/Category.pm
  98. +12 −7 lib/Bric/Util/Burner.pm
  99. +42 −42 lib/Bric/Util/Burner/Mason.pm
  100. +2 −2 lib/Bric/Util/Coll/OCElement.pm
  101. +10 −2 lib/Bric/Util/DBD/Pg.pm
  102. +31 −1 lib/Bric/Util/DBD/mysql.pm
  103. +74 −20 lib/Bric/Util/DBI.pm
  104. +5 −4 lib/Bric/Util/Event.pm
  105. +21 −24 lib/Bric/Util/Fault.pm
  106. +315 −318 lib/Bric/Util/Language/pt_pt.pm
  107. +12 −8 lib/Bric/Util/Priv.pm
  108. +1 −0 lib/Bric/Util/Trans/SFTP.pm
  109. +3 −3 sql/Pg/Bric.sql
  110. +2 −2 sql/Pg/Bric/Biz/Asset/Business/Story.con
  111. +1 −1 sql/Pg/Bric/Biz/Asset/Template.con
  112. +12 −12 sql/Pg/Bric/Biz/Asset/Template.val
  113. +1 −1 sql/Pg/Bric/Util/Alert.con
  114. +1 −1 sql/Pg/Bric/Util/Alerted.con
  115. +4 −1 sql/Pg/Bric/Util/Pref.val
  116. +79 −0 sql/mysql/Bric.sql
  117. +34 −0 sql/mysql/Bric/Biz/ATType.con
  118. +69 −0 sql/mysql/Bric/Biz/ATType.sql
  119. +11 −0 sql/mysql/Bric/Biz/ATType.val
  120. +158 −0 sql/mysql/Bric/Biz/Asset/Business/Media.con
  121. +209 −0 sql/mysql/Bric/Biz/Asset/Business/Media.sql
  122. +17 −0 sql/mysql/Bric/Biz/Asset/Business/Media.val
  123. +141 −0 sql/mysql/Bric/Biz/Asset/Business/Story.con
  124. +190 −0 sql/mysql/Bric/Biz/Asset/Business/Story.sql
  125. +102 −0 sql/mysql/Bric/Biz/Asset/Template.con
  126. +113 −0 sql/mysql/Bric/Biz/Asset/Template.sql
  127. +428 −0 sql/mysql/Bric/Biz/Asset/Template.val
  128. +64 −0 sql/mysql/Bric/Biz/Category.con
  129. +162 −0 sql/mysql/Bric/Biz/Category.sql
  130. +36 −0 sql/mysql/Bric/Biz/Category.val
  131. +28 −0 sql/mysql/Bric/Biz/Contact.con
  132. +69 −0 sql/mysql/Bric/Biz/Contact.sql
  133. +50 −0 sql/mysql/Bric/Biz/Contact.val
  134. +60 −0 sql/mysql/Bric/Biz/Element/Container.con
  135. +79 −0 sql/mysql/Bric/Biz/Element/Container.sql
  136. +42 −0 sql/mysql/Bric/Biz/Element/Field.con
  137. +83 −0 sql/mysql/Bric/Biz/Element/Field.sql
  138. +182 −0 sql/mysql/Bric/Biz/ElementType.con
  139. +227 −0 sql/mysql/Bric/Biz/ElementType.sql
  140. +373 −0 sql/mysql/Bric/Biz/ElementType.val
  141. +47 −0 sql/mysql/Bric/Biz/ElementType/Parts/FieldType.con
  142. +139 −0 sql/mysql/Bric/Biz/ElementType/Parts/FieldType.sql
  143. +169 −0 sql/mysql/Bric/Biz/ElementType/Parts/FieldType.val
  144. +45 −0 sql/mysql/Bric/Biz/Keyword.con
  145. +108 −0 sql/mysql/Bric/Biz/Keyword.sql
  146. +15 −0 sql/mysql/Bric/Biz/Org.con
  147. +37 −0 sql/mysql/Bric/Biz/Org.sql
  148. +16 −0 sql/mysql/Bric/Biz/Org.val
  149. +36 −0 sql/mysql/Bric/Biz/Org/Parts/Addr.con
  150. +87 −0 sql/mysql/Bric/Biz/Org/Parts/Addr.sql
  151. +25 −0 sql/mysql/Bric/Biz/Org/Parts/Addr.val
  152. +22 −0 sql/mysql/Bric/Biz/Org/Person.con
  153. +40 −0 sql/mysql/Bric/Biz/Org/Person.sql
  154. +8 −0 sql/mysql/Bric/Biz/Org/Person.val
  155. +18 −0 sql/mysql/Bric/Biz/Org/Source.con
  156. +39 −0 sql/mysql/Bric/Biz/Org/Source.sql
  157. +16 −0 sql/mysql/Bric/Biz/Org/Source.val
  158. +84 −0 sql/mysql/Bric/Biz/OutputChannel.con
  159. +93 −0 sql/mysql/Bric/Biz/OutputChannel.sql
  160. +22 −0 sql/mysql/Bric/Biz/OutputChannel.val
  161. +23 −0 sql/mysql/Bric/Biz/Person.con
  162. +61 −0 sql/mysql/Bric/Biz/Person.sql
  163. +20 −0 sql/mysql/Bric/Biz/Person.val
  164. +13 −0 sql/mysql/Bric/Biz/Person/User.con
  165. +32 −0 sql/mysql/Bric/Biz/Person/User.sql
  166. +28 −0 sql/mysql/Bric/Biz/Person/User.val
  167. +29 −0 sql/mysql/Bric/Biz/Site.con
  168. +55 −0 sql/mysql/Bric/Biz/Site.sql
  169. +20 −0 sql/mysql/Bric/Biz/Site.val
  170. +78 −0 sql/mysql/Bric/Biz/Workflow.con
  171. +68 −0 sql/mysql/Bric/Biz/Workflow.sql
  172. +273 −0 sql/mysql/Bric/Biz/Workflow.val
  173. +40 −0 sql/mysql/Bric/Biz/Workflow/Parts/Desk.con
  174. +63 −0 sql/mysql/Bric/Biz/Workflow/Parts/Desk.sql
  175. +33 −0 sql/mysql/Bric/Biz/Workflow/Parts/Desk.val
  176. +49 −0 sql/mysql/Bric/Dist/Action.con
  177. +112 −0 sql/mysql/Bric/Dist/Action.sql
  178. +39 −0 sql/mysql/Bric/Dist/Action.use
  179. +25 −0 sql/mysql/Bric/Dist/ActionType.con
  180. +50 −0 sql/mysql/Bric/Dist/ActionType.sql
  181. +55 −0 sql/mysql/Bric/Dist/ActionType.val
  182. +54 −0 sql/mysql/Bric/Dist/Resource.con
  183. +74 −0 sql/mysql/Bric/Dist/Resource.sql
  184. +8 −0 sql/mysql/Bric/Dist/Resource.val
  185. +22 −0 sql/mysql/Bric/Dist/Server.con
  186. +40 −0 sql/mysql/Bric/Dist/Server.sql
  187. +10 −0 sql/mysql/Bric/Dist/Server.val
  188. +50 −0 sql/mysql/Bric/Dist/ServerType.con
  189. +77 −0 sql/mysql/Bric/Dist/ServerType.sql
  190. +10 −0 sql/mysql/Bric/Dist/ServerType.val
  191. +28 −0 sql/mysql/Bric/Util/Alert.con
  192. +39 −0 sql/mysql/Bric/Util/Alert.sql
  193. +8 −0 sql/mysql/Bric/Util/Alert.val
  194. +61 −0 sql/mysql/Bric/Util/AlertType.con
  195. +81 −0 sql/mysql/Bric/Util/AlertType.sql
  196. +8 −0 sql/mysql/Bric/Util/AlertType.val
  197. +22 −0 sql/mysql/Bric/Util/AlertType/Parts/Rule.con
  198. +37 −0 sql/mysql/Bric/Util/AlertType/Parts/Rule.sql
  199. +8 −0 sql/mysql/Bric/Util/AlertType/Parts/Rule.val
  200. +43 −0 sql/mysql/Bric/Util/Alerted.con
  201. +61 −0 sql/mysql/Bric/Util/Alerted.sql
  202. +8 −0 sql/mysql/Bric/Util/Alerted.val
  203. +50 −0 sql/mysql/Bric/Util/Attribute.con
  204. +114 −0 sql/mysql/Bric/Util/Attribute.sql
  205. +8 −0 sql/mysql/Bric/Util/Attribute.val
  206. +42 −0 sql/mysql/Bric/Util/Class.con
  207. +42 −0 sql/mysql/Bric/Util/Class.sql
  208. +259 −0 sql/mysql/Bric/Util/Class.val
  209. +32 −0 sql/mysql/Bric/Util/Event.con
  210. +58 −0 sql/mysql/Bric/Util/Event.sql
  211. +10 −0 sql/mysql/Bric/Util/Event.val
  212. +39 −0 sql/mysql/Bric/Util/EventType.con
  213. +60 −0 sql/mysql/Bric/Util/EventType.sql
  214. +940 −0 sql/mysql/Bric/Util/EventType.val
  215. +49 −0 sql/mysql/Bric/Util/Grp.con
  216. +43 −0 sql/mysql/Bric/Util/Grp.sql
  217. +605 −0 sql/mysql/Bric/Util/Grp.val
  218. +22 −0 sql/mysql/Bric/Util/Grp/AlertType.con
  219. +33 −0 sql/mysql/Bric/Util/Grp/AlertType.sql
  220. +26 −0 sql/mysql/Bric/Util/Grp/ContribType.con
  221. +34 −0 sql/mysql/Bric/Util/Grp/ContribType.sql
  222. +10 −0 sql/mysql/Bric/Util/Grp/Event.con
  223. +12 −0 sql/mysql/Bric/Util/Grp/Event.sql
  224. +20 −0 sql/mysql/Bric/Util/Grp/Org.con
  225. +33 −0 sql/mysql/Bric/Util/Grp/Org.sql
  226. +22 −0 sql/mysql/Bric/Util/Grp/Parts/Grp_Member.con
  227. +52 −0 sql/mysql/Bric/Util/Grp/Parts/Grp_Member.sql
  228. +35 −0 sql/mysql/Bric/Util/Grp/Parts/Member.con
  229. +77 −0 sql/mysql/Bric/Util/Grp/Parts/Member.sql
  230. +45 −0 sql/mysql/Bric/Util/Grp/Parts/Member/Contrib.val
  231. +32 −0 sql/mysql/Bric/Util/Grp/Parts/Member_Attr.con
  232. +89 −0 sql/mysql/Bric/Util/Grp/Parts/Member_Attr.sql
  233. +20 −0 sql/mysql/Bric/Util/Grp/Source.con
  234. +34 −0 sql/mysql/Bric/Util/Grp/Source.sql
  235. +20 −0 sql/mysql/Bric/Util/Grp/User.con
  236. +33 −0 sql/mysql/Bric/Util/Grp/User.sql
  237. +38 −0 sql/mysql/Bric/Util/Grp_Attr.con
  238. +107 −0 sql/mysql/Bric/Util/Grp_Attr.sql
  239. +111 −0 sql/mysql/Bric/Util/Job.con
  240. +102 −0 sql/mysql/Bric/Util/Job.sql
  241. +10 −0 sql/mysql/Bric/Util/Job.val
  242. +36 −0 sql/mysql/Bric/Util/Language.sql
  243. +37 −0 sql/mysql/Bric/Util/MediaType.con
  244. +70 −0 sql/mysql/Bric/Util/MediaType.sql
  245. +1,242 −0 sql/mysql/Bric/Util/MediaType.val
  246. +48 −0 sql/mysql/Bric/Util/Pref.con
  247. +87 −0 sql/mysql/Bric/Util/Pref.sql
  248. +1,698 −0 sql/mysql/Bric/Util/Pref.val
  249. +60 −0 sql/mysql/Bric/Util/Priv.con
  250. +164 −0 sql/mysql/Bric/Util/Priv.sql
  251. +439 −0 sql/mysql/Bric/Util/Priv.val
  252. +1 −1 t/Bric/Biz/Asset/Business/DevTest.pm
  253. +3 −2 t/Bric/Biz/Asset/Business/Media/DevTest.pm
  254. +6 −1 t/Bric/Biz/Element/Container/DevTest.pm
  255. +5 −6 t/Bric/Test/Base.pm
  256. +129 −152 t/Bric/Util/DBI/DevTest.pm
View
@@ -32,33 +32,34 @@ BRIC_VERSION = `$(PERL) -ne '/VERSION.*?([\d\.]+)/ and print $$1 and exit' < lib
# build rules #
#########################
-all : required.db modules.db apache.db postgres.db config.db \
+all : required.db modules.db apache.db database.db config.db \
bconf/bricolage.conf build_done
+# This scans for dbprobe_*.pl files and passes them to required.pl to let
+# the user choose the database he wants (database names should conform to
+# DBD:: package name, ex: dbprobe_Pg for PostgresSQL)
+
+DATABASE_PROBES := $(shell find inst -name 'dbprobe_*.pl')
+
required.db : inst/required.pl
- $(PERL) inst/required.pl $(INSTALL_VERBOSITY)
+ $(PERL) inst/required.pl $(INSTALL_VERBOSITY) $(DATABASE_PROBES)
modules.db : inst/modules.pl lib/Bric/Admin.pod
$(PERL) inst/modules.pl $(INSTALL_VERBOSITY)
apache.db : inst/apache.pl required.db
$(PERL) inst/apache.pl $(INSTALL_VERBOSITY)
-# This should be updated to something more database-independent. In fact,
-# what should happen is that a script should present a list of supported
-# databases, the user picks which one (each with a key name for the DBD
-# driver, e.g., "Pg", "mysql", "Oracle", etc.), and then the rest of the
-# work should just assume that database and do the work for that database.
-postgres.db : inst/postgres.pl required.db
- $(PERL) inst/postgres.pl $(INSTALL_VERBOSITY)
+database.db : inst/database.pl required.db $(DATABASE_PROBES)
+ $(PERL) inst/database.pl $(INSTALL_VERBOSITY)
-config.db : inst/config.pl required.db apache.db postgres.db
+config.db : inst/config.pl required.db apache.db database.db
$(PERL) inst/config.pl $(INSTALL_VERBOSITY)
bconf/bricolage.conf : required.db inst/conf.pl
$(PERL) inst/conf.pl INSTALL $(BRIC_VERSION)
-build_done : required.db modules.db apache.db postgres.db config.db \
+build_done : required.db modules.db apache.db database.db config.db \
bconf/bricolage.conf
@echo
@echo ===========================================================
@@ -82,18 +83,15 @@ build_done : required.db modules.db apache.db postgres.db config.db \
# dist rules #
###########################
-dist : check_dist distclean inst/Pg.sql dist_dir \
+dist : check_dist distclean inst/dist_sql dist_dir \
rm_svn rm_tmp dist/INSTALL dist/Changes \
dist/License dist_tar
check_dist :
$(PERL) inst/check_dist.pl $(BRIC_VERSION)
-distclean : clean
- -rm -rf bricolage-$(BRIC_VERSION)
- -rm -f bricolage-$(BRIC_VERSION).tar.gz
+distclean : cloneclean
-rm -f inst/*.sql
- -rm -rf dist
dist_dir :
-rm -rf dist
@@ -121,30 +119,35 @@ dist_tar :
gzip --best bricolage-$(BRIC_VERSION).tar
SQL_FILES := $(shell find lib -name '*.sql' -o -name '*.val' -o -name '*.con')
+SQL_DIRS := $(shell find sql -maxdepth 1 -regex 'sql/.*' -a \! -regex 'sql/\.svn')
-# Update this later to be database-independent.
-inst/Pg.sql : $(SQL_FILES)
- grep -vh '^--' `find sql/Pg -name '*.sql' | env LANG= LANGUAGE= LC_ALL=POSIX sort` > $@;
- grep -vh '^--' `find sql/Pg -name '*.val' | env LANG= LANGUAGE= LC_ALL=POSIX sort` >> $@;
- grep -vh '^--' `find sql/Pg -name '*.con' | env LANG= LANGUAGE= LC_ALL=POSIX sort` >> $@;
+# This creates the apropriate sql initialization scripts for the databases with
+# directories in sql (directory names should conform to DBD:: package name,
+# ex: Pg for PostgresSQL).
+inst/dist_sql : $(SQL_FILES) inst/dist_sql.pl
+ $(PERL) inst/dist_sql.pl $(SQL_DIRS)
-.PHONY : distclean inst/Pg.sql dist_dir rm_svn dist_tar check_dist
+.PHONY : distclean inst/dist_sql dist_dir rm_svn dist_tar check_dist
##########################
# clone rules #
##########################
-clone : distclean clone.db clone_dist_dir clone_sql clone_files \
+clone : cloneclean clone.db clone_dist_dir clone_files clone_sql \
rm_svn rm_tmp \
dist/INSTALL dist/Changes dist/License \
clone_tar
-devclone : distclean clone.db clone_dist_dir clone_sql clone_files \
+devclone : distclean clone.db clone_dist_dir clone_files clone_sql \
rm_svn rm_tmp \
dist/INSTALL dist/Changes dist/License \
clone_lightweight \
clone_tar
+cloneclean : clean
+ -rm -rf bricolage-*
+ -rm -rf dist
+
clone.db :
$(PERL) inst/clone.pl
@@ -158,7 +161,9 @@ clone_files :
clone_lightweight :
$(PERL) inst/clone_lightweight.pl
-clone_sql :
+CLONE_SQL_FILES := $(shell find inst -name 'clone_sql_*.pl')
+
+clone_sql : $(CLONE_SQL_FILES)
$(PERL) inst/clone_sql.pl
clone_tar :
@@ -174,12 +179,12 @@ install : install_files install_db done
install_files : all is_root cpan lib bin files
-install_db : db db_grant
+install_db : db db_grant
is_root : inst/is_root.pl
$(PERL) inst/is_root.pl
-cpan : modules.db postgres.db inst/cpan.pl
+cpan : modules.db database.db inst/cpan.pl
$(PERL) inst/cpan.pl
lib :
@@ -193,11 +198,14 @@ bin :
files : config.db bconf/bricolage.conf
$(PERL) inst/files.pl
-db : inst/db.pl postgres.db
+DBLOAD_FILES := $(shell find inst -name 'dbload_*.sql')
+
+db : inst/db.pl database.db $(DBLOAD_FILES)
$(PERL) inst/db.pl
-db_grant : inst/db.pl postgres.db
- $(PERL) inst/db_grant.pl
+DBGRANT_FILES := $(shell find inst -name 'dbgrant_*.sql')
+db_grant : inst/dbgrant.pl database.db $(DBGRANT_FILES)
+ $(PERL) inst/dbgrant.pl
done : bconf/bricolage.conf db files bin lib cpan
$(PERL) inst/done.pl
@@ -210,7 +218,7 @@ done : bconf/bricolage.conf db files bin lib cpan
# upgrade rules #
##########################
-upgrade : upgrade.db required.db postgres.db bconf/bricolage.conf \
+upgrade : upgrade.db required.db modules.db database.db bconf/bricolage.conf \
is_root cpan stop db_upgrade lib bin \
upgrade_files upgrade_conf upgrade_done
@@ -253,7 +261,8 @@ uninstall : is_root prep_uninstall stop db_uninstall rm_files clean
prep_uninstall :
$(PERL) inst/uninstall.pl
-db_uninstall :
+DB_UNINST_FILES := $(shell find inst -name 'db_uninst_*.pl')
+db_uninstall :$(DB_UNINST_FILES)
$(PERL) inst/db_uninstall.pl
rm_files :
@@ -269,8 +278,7 @@ rm_files :
dev_symlink :
$(PERL) inst/dev.pl
-dev : inst/Pg.sql install dev_symlink clean
-
+dev : inst/dist_sql install dev_symlink clean
##########################
# test rules #
View
@@ -147,6 +147,11 @@ use Bric::Dist::Action::Mover;
use Bric::Dist::Action::Email;
use Bric::Dist::Action::DTDValidate;
+# Allow templates from before 1.10 to keep working.
+use Bric::Biz::Asset::Business::Parts::Tile::Container;
+use Bric::Biz::Asset::Formatting;
+use Bric::Biz::AssetType;
+
##############################################################################
# Constants.
##############################################################################
@@ -224,12 +229,12 @@ sub run_as_daemon {
# fork off a process for dist jobs
my $pkg = fork_to_dist();
login();
- for (;;) {
+ while (1) {
for my $job ($pkg->list({
sched_time => [undef, strfdate()],
comp_time => undef,
- failed => 0,
- executing => 0,
+ failed => '0',
+ executing => '0',
})) {
print 'Executing ' . $job->get_name . "\n" if $Verbose;
eval {
@@ -292,8 +297,8 @@ sub run_single_job {
my ($job) = $pkg->list({
sched_time => [undef, strfdate()],
comp_time => undef,
- failed => 0,
- executing => 0,
+ failed => '0',
+ executing => '0',
});
exit unless $job;
print 'Executing ' . $job->get_name . "\n" if $Verbose;
@@ -318,9 +323,7 @@ Returns a package name from which we will get jobs to run.
##############################################################################
sub fork_to_dist {
- my $reaper;
- $reaper = sub { wait; $SIG{CHLD} = $reaper; };
- $SIG{CHLD} = $reaper;
+ $SIG{CHLD} = sub { wait; $SIG{CHLD} = $reaper; };
defined ($DistPid = fork) or die "Can't fork: $!\n";
if ($DistPid) { # a non-zero pid means we are the parent
return PUB_PKG;
@@ -418,7 +421,7 @@ delete the pidfile if any
sub del_pid {
return unless $Pidfile;
- unlink $Pidfile or die "Cannot unlink PID file $Pidfile."
+ unlink $Pidfile or die "Cannot unlink PID file $Pidfile.\n"
}
##############################################################################
@@ -435,17 +438,17 @@ sub daemonize {
write_pid(''); # tests the writability of Pidfile
del_pid(); # in case the process dies before forking
$SIG{TERM} = \&handle_term;
- chdir '/' or die "Can't chdir to /: $!";
- open STDIN, '/dev/null' or die "Can't read from /dev/null: $!";
- open STDOUT, ">>$Logfile" or die "Can't write to logfile: $!";
- defined (my $pid = fork) or die "Can't fork: $!";
+ chdir '/' or die "Can't chdir to /: $!\n";
+ open STDIN, '/dev/null' or die "Can't read from /dev/null: $!\n";
+ open STDOUT, ">>$Logfile" or die "Can't write to logfile: $!\n";
+ defined (my $pid = fork) or die "Can't fork: $!\n";
if ($pid) {
- # only the original process gets the PID of the new running daemon
+ # only the parent process gets the PID of the new running daemon
write_pid($pid);
exit;
}
- setsid or die "Can't start a new session: $!";
- open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+ setsid or die "Can't start a new session: $!\n";
+ open STDERR, '>&STDOUT' or die "Can't dup stdout: $!\n";
}
##############################################################################
View
@@ -69,6 +69,31 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+<p>Some of the icons distributed with Bricolage are covered under other open
+source licenses:</p>
+
+<ul>
+<li>The Nuvola icon set, from David Vignoni (http://icon-king.com), is
+covered under the GNU Lesser General Public License:
+
+<blockquote>
+<p>This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.</p>
+
+<p>This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.</p>
+
+<p>You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</p>
+</blockquote>
+</li>
+</ul>
+
% $m->comp(".t_bottom");
<br />
% $m->comp(".t_top", caption => "Credits");
View
@@ -50,6 +50,31 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+<p>Some of the icons distributed with Bricolage are covered under other open
+source licenses:</p>
+
+<ul>
+<li>The Nuvola icon set, from David Vignoni (http://icon-king.com), is
+covered under the GNU Lesser General Public License:
+
+<blockquote>
+<p>This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.</p>
+
+<p>This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.</p>
+
+<p>You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</p>
+</blockquote>
+</li>
+</ul>
+
% $m->comp(".t_bottom");
<br />
% $m->comp(".t_top", caption => "Credits");
View
@@ -70,6 +70,32 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+
+<p>Some of the icons distributed with Bricolage are covered under other open
+source licenses:</p>
+
+<ul>
+<li>The Nuvola icon set, from David Vignoni (http://icon-king.com), is
+covered under the GNU Lesser General Public License:
+
+<blockquote>
+<p>This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.</p>
+
+<p>This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.</p>
+
+<p>You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</p>
+</blockquote>
+</li>
+</ul>
+
% $m->comp(".t_bottom");
% $m->comp(".t_top", caption => "Credits");
View
@@ -69,6 +69,31 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+<p>Some of the icons distributed with Bricolage are covered under other open
+source licenses:</p>
+
+<ul>
+<li>The Nuvola icon set, from David Vignoni (http://icon-king.com), is
+covered under the GNU Lesser General Public License:
+
+<blockquote>
+<p>This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.</p>
+
+<p>This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.</p>
+
+<p>You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</p>
+</blockquote>
+</li>
+</ul>
+
% $m->comp(".t_bottom");
% $m->comp(".t_top", caption => "Credits");
Oops, something went wrong.

0 comments on commit bdafec0

Please sign in to comment.