From 6f7d6f67541cc93378f5b265fdff431320801927 Mon Sep 17 00:00:00 2001 From: csilvers Date: Wed, 25 Jan 2012 01:28:24 +0000 Subject: [PATCH] Tue Jan 24 16:00:51 2012 Google Inc. * ctemplate: version 2.0 release * Changed the 'official' ctemplate email in setup.py/etc * Rewrote docs to refer to Ctemplate, not Google Template * Renamed google-ctemplate.sln to ctemplate.sln * Changed copyright text to reflect Google's relinquished ownership --- AUTHORS | 2 +- ChangeLog | 8 ++++ Makefile.am | 2 +- Makefile.in | 2 +- NEWS | 29 +++++++++++++- README_windows.txt | 6 +-- configure | 80 +++++++++++++++++++-------------------- configure.ac | 2 +- contrib/tpl-mode.el | 4 +- doc/auto_escape.html | 2 - doc/designstyle.css | 6 --- doc/example.html | 2 - doc/guide.html | 14 +++---- doc/howto.html | 2 +- doc/index.html | 20 +++++----- doc/reference.html | 10 ++--- doc/tips.html | 8 ++-- doc/xss_resources.html | 2 - packages/deb/changelog | 6 +++ packages/deb/control | 2 +- packages/deb/copyright | 8 ++-- packages/rpm/rpm.spec | 6 +-- src/windows/preprocess.sh | 2 +- 23 files changed, 126 insertions(+), 99 deletions(-) diff --git a/AUTHORS b/AUTHORS index ee92be8..044c44e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,2 @@ -opensource@google.com +google-ctemplate@googlegroups.com diff --git a/ChangeLog b/ChangeLog index a8561b7..47b5b80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jan 24 16:00:51 2012 Google Inc. + + * ctemplate: version 2.0 release + * Changed the 'official' ctemplate email in setup.py/etc + * Rewrote docs to refer to Ctemplate, not Google Template + * Renamed google-ctemplate.sln to ctemplate.sln + * Changed copyright text to reflect Google's relinquished ownership + Thu Dec 22 14:03:27 2011 Google Inc. * ctemplate: version 1.1 release diff --git a/Makefile.am b/Makefile.am index e6437de..1eec885 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,7 +70,7 @@ noinst_LTLIBRARIES = bin_PROGRAMS = bin_SCRIPTS = ## The location of the windows project file for each binary we make -WINDOWS_PROJECTS = google-ctemplate.sln +WINDOWS_PROJECTS = ctemplate.sln ## unittests you want to run when people type 'make check'. diff --git a/Makefile.in b/Makefile.in index 834be53..1cfdb67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -836,7 +836,7 @@ noinst_LTLIBRARIES = libctemplate_debug.la \ libctemplate_nothreads_debug.la libctemplate_testing.la \ libctemplate_testing_nothreads.la bin_SCRIPTS = src/template-converter -WINDOWS_PROJECTS = google-ctemplate.sln \ +WINDOWS_PROJECTS = ctemplate.sln \ vsprojects/libctemplate/libctemplate.vcproj \ vsprojects/make_tpl_varname_h/make_tpl_varname_h.vcproj \ vsprojects/diff_tpl_auto_escape/diff_tpl_auto_escape.vcproj \ diff --git a/NEWS b/NEWS index e94c12b..cff93ec 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,30 @@ -== 22 December 2011 == +== 24 January 2012 == + +I've just released ctemplate 2.0. It has no functional changes from +ctemplate 1.2. + +The `google-ctemplate` project has been renamed to `ctemplate`. I +(csilvers) am stepping down as maintainer, to be replaced by Olaf van +der Spek. Welcome to the team, Olaf! I've been impressed by your +contributions to the project discussions and code to date, and look +forward to having you on the team. + +I bumped the major version number up to 2 to reflect the new community +ownership of the project. All the +[http://google-ctemplate.googlecode.com/svn/tags/ctemplate-2.0/ChangeLog changes] +are related to the renaming. + + +=== 18 January 2011 === + +The `google-ctemplate` Google Code page has been renamed to +`ctemplate`, in preparation for the project being renamed to +`ctemplate`. In the coming weeks, I'll be stepping down as +maintainer for the ctemplate project, and as part of that Google is +relinquishing ownership of the project; it will now be entirely +community run. The name change reflects that shift. + +=== 22 December 2011 === I've just released ctemplate 1.1. The only functionality change is obscure: when a reload is done (via, say, `ReloadAllIfChanged`), and a @@ -12,7 +38,6 @@ file if the old file had changed on disk, and would otherwise leave the template alone. Even more minor changes are in the [http://google-ctemplate.googlecode.com/svn/tags/ctemplate-1.1/ChangeLog ChangeLog]. - === 26 August 2011 === I've just released ctemplate 1.0! (I've decided 4 weeks is well diff --git a/README_windows.txt b/README_windows.txt index c40acae..2a89f75 100644 --- a/README_windows.txt +++ b/README_windows.txt @@ -1,6 +1,6 @@ This project has been ported to Windows. A working solution file exists in this directory: - google-ctemplate.sln + ctemplate.sln You can load this solution file into either VC++ 7.1 (Visual Studio 2003) or VC++ 8.0 (Visual Studio 2005) -- in the latter case, it will @@ -36,8 +36,8 @@ followed by Template::GetTemplate(). I have little experience with Windows programming, so there may be better ways to set this up than I've done! If you run across any problems, please post to the google-ctemplate Google Group, or report -them on the google-ctemplate Google Code site: +them on the ctemplate Google Code site: http://groups.google.com/group/google-ctemplate - http://code.google.com/p/google-ctemplate/issues/list + http://code.google.com/p/ctemplate/issues/list -- craig diff --git a/configure b/configure index cd3244d..e4738f9 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for ctemplate 1.1. +# Generated by GNU Autoconf 2.62 for ctemplate 2.0. # -# Report bugs to . +# Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -745,9 +745,9 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='ctemplate' PACKAGE_TARNAME='ctemplate' -PACKAGE_VERSION='1.1' -PACKAGE_STRING='ctemplate 1.1' -PACKAGE_BUGREPORT='opensource@google.com' +PACKAGE_VERSION='2.0' +PACKAGE_STRING='ctemplate 2.0' +PACKAGE_BUGREPORT='google-ctemplate@google.com' ac_unique_file="README" # Factoring default headers for most tests. @@ -1501,7 +1501,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ctemplate 1.1 to adapt to many kinds of systems. +\`configure' configures ctemplate 2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1571,7 +1571,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ctemplate 1.1:";; + short | recursive ) echo "Configuration of ctemplate 2.0:";; esac cat <<\_ACEOF @@ -1614,7 +1614,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1677,7 +1677,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ctemplate configure 1.1 +ctemplate configure 2.0 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1691,7 +1691,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ctemplate $as_me 1.1, which was +It was created by ctemplate $as_me 2.0, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2496,7 +2496,7 @@ fi # Define the identity of the package. PACKAGE='ctemplate' - VERSION='1.1' + VERSION='2.0' cat >>confdefs.h <<_ACEOF @@ -16092,9 +16092,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to opensource@google.com ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to google-ctemplate@google.com ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -16242,9 +16242,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to opensource@google.com ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to google-ctemplate@google.com ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -17269,9 +17269,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to opensource@google.com ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to google-ctemplate@google.com ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -17419,9 +17419,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to opensource@google.com ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to google-ctemplate@google.com ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -17569,9 +17569,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to opensource@google.com ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to google-ctemplate@google.com ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -17719,9 +17719,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to opensource@google.com ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to google-ctemplate@google.com ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -17869,9 +17869,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to opensource@google.com ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to google-ctemplate@google.com ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -18019,9 +18019,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to opensource@google.com ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to google-ctemplate@google.com ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -18169,9 +18169,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to opensource@google.com ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to google-ctemplate@google.com ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -20263,7 +20263,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ctemplate $as_me 1.1, which was +This file was extended by ctemplate $as_me 2.0, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20316,7 +20316,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -ctemplate config.status 1.1 +ctemplate config.status 2.0 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 1f0ef7b..d37e43d 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # make sure we're interpreted by some minimal autoconf AC_PREREQ(2.57) -AC_INIT(ctemplate, 1.1, opensource@google.com) +AC_INIT(ctemplate, 2.0, google-ctemplate@google.com) # Update this value for every release! (A:B:C will map to foo.so.(A-C).C.B) # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html SO_VERSION=1:3:1 diff --git a/contrib/tpl-mode.el b/contrib/tpl-mode.el index 3a208d3..ff1afd4 100644 --- a/contrib/tpl-mode.el +++ b/contrib/tpl-mode.el @@ -25,7 +25,7 @@ (require 'font-lock)) (defgroup tpl-mode nil - "Major mode for editing Google CTemplate files" + "Major mode for editing CTemplate files" :group 'languages) (defvar tpl-mode-version "1.0" @@ -242,7 +242,7 @@ (put 'tpl-mode 'font-lock-defaults '(tpl-font-lock-keywords nil t)) (defun tpl-mode () - "Major mode for editing Google CTemplate file." + "Major mode for editing CTemplate file." (interactive) (kill-all-local-variables) (use-local-map tpl-mode-map) diff --git a/doc/auto_escape.html b/doc/auto_escape.html index 2ea9c84..2b5dd12 100644 --- a/doc/auto_escape.html +++ b/doc/auto_escape.html @@ -4,8 +4,6 @@ Guide to using Auto Escape -