trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r917851 - in /incubator/trafficserver/traffic/tags/2.0.0-alpha: ./ m4/ proxy/ proxy/mgmt2/html2/ proxy/mgmt2/html2/agent-installer/ proxy/mgmt2/html2/charting/ proxy/mgmt2/html2/configure/ proxy/mgmt2/html2/configure/helper/ proxy/mgmt2/htm...
Date Tue, 02 Mar 2010 03:18:14 GMT
Author: zwoop
Date: Tue Mar  2 03:18:12 2010
New Revision: 917851

URL: http://svn.apache.org/viewvc?rev=917851&view=rev
Log:
TS-200: Merge from 2.0.x branch fixes for this release

Modified:
    incubator/trafficserver/traffic/tags/2.0.0-alpha/   (props changed)
    incubator/trafficserver/traffic/tags/2.0.0-alpha/INSTALL
    incubator/trafficserver/traffic/tags/2.0.0-alpha/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/STATUS
    incubator/trafficserver/traffic/tags/2.0.0-alpha/configure.ac
    incubator/trafficserver/traffic/tags/2.0.0-alpha/m4/   (props changed)
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/agent-installer/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/charting/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/configure/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/configure/helper/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/images/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/include/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/monitor/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/mrtg/Makefile.am
    incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/tune/Makefile.am

Propchange: incubator/trafficserver/traffic/tags/2.0.0-alpha/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar  2 03:18:12 2010
@@ -8,3 +8,8 @@
 config.status
 libtool
 Makefile
+install
+*.bz2
+*.md5
+*.sha1
+*.asc

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/INSTALL
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/INSTALL?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/INSTALL (original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/INSTALL Tue Mar  2 03:18:12 2010
@@ -7,11 +7,21 @@
 
         http://incubator.apache.org/trafficserver/docs/admin/
 
-
+  Configure & Build:
+    On Linux:
      $ ./configure [--prefix=PREFIX]
      $ make
+
+  Next set the cluster interface in 'records.config'
+    On Linux: e.g
+      CONFIG proxy.config.cluster.ethernet_interface STRING eth0
+
+  To install:
      $ make install
-     $ PREFIX/bin/trafficserver start
+
+  To start Traffic Server process stack (TC, TM, TS):
+    On Linux:
+      $ sudo PREFIX/bin/trafficserver start
 
 
   The default PREFIX is /usr/local, unless explicitly specified.

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/Makefile.am (original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/Makefile.am Tue Mar  2 03:18:12 2010
@@ -31,7 +31,7 @@
 DIST_BUILD_USER_GROUP=`id -ng`
 DISTCHECK_CONFIGURE_FLAGS=--with-user=${DIST_BUILD_USER} --with-group=${DIST_BUILD_USER_GROUP}
 
-EXTRA_DIST=CHANGES INSTALL STATUS NOTICE LICENSE
+EXTRA_DIST=CHANGES INSTALL STATUS NOTICE LICENSE example contrib
 
 installcheck-local:
 	$(DESTDIR)$(bindir)/traffic_server -R 1
@@ -40,12 +40,29 @@
 doxygen:
 	$(MAKE) -C doc doxygen
 
+asf-distdir:
+	@$(am__remove_distdir)
+	svn export . $(distdir)
+	cd $(distdir) && autoreconf -i
+	rm -rf $(distdir)/test $(distdir)/autom4te.cache
+
+asf-dist: asf-distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	@$(am__remove_distdir)
+
+asf-dist-sign: asf-dist 
+	md5sum $(distdir).tar.bz2 >$(distdir).tar.bz2.md5
+	sha1sum $(distdir).tar.bz2 >$(distdir).tar.bz2.sha1
+	gpg --armor --output $(distdir).tar.bz2.asc  --detach-sig $(distdir).tar.bz2
+
 help:
 	@echo 'all            default target for building the package' && \
    echo 'check          run the test suite, if any' && \
    echo 'clean          remove whatever make created' && \
    echo 'distclean      remove whatever configure created' && \
-   echo 'dist           recreate source package' && \
+   echo 'dist           DEPRECATED: recreate source package' && \
+   echo 'asf-dist       recreate source package' && \
+   echo 'asf-dist-sign  recreate source package, with checksums and signature' &&
\
    echo 'distcheck      verify dist by performing VPATH build and then distclean' &&
\
    echo 'doxygen        generate doxygen docs in doc/html dir' && \
    echo 'help           display this list of make targets' && \

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/STATUS
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/STATUS?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/STATUS (original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/STATUS Tue Mar  2 03:18:12 2010
@@ -34,3 +34,10 @@
 For the final 2.0.0 ATS release, see the bug list at
 
   http://bit.ly/ATS-2-0-0
+
+
+RELEASE PROCESS
+
+The Traffic Server release process is documented at
+
+    http://cwiki.apache.org/confluence/display/TS/ReleaseProcess

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/configure.ac?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/configure.ac (original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/configure.ac Tue Mar  2 03:18:12 2010
@@ -27,10 +27,10 @@
 # -----------------------------------------------------------------------------
 # 1. INITIALIZATION
 
-AC_INIT([Apache Traffic Server], [2.0.0-alpha], [trafficserver-dev@incubator.apache.org],
[trafficserver],[http://incubator.apache.org/projects/trafficserver.html])
+AC_INIT([Apache Traffic Server], [2.0.0-alpha], [trafficserver-dev@incubator.apache.org],
[apache-trafficserver-incubating],[http://incubator.apache.org/projects/trafficserver.html])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman 1.9.2])
+AM_INIT_AUTOMAKE([tar-ustar -Wall -Werror foreign no-installinfo no-installman 1.9.2])
 AC_CONFIG_SRCDIR([proxy/Main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -299,16 +299,19 @@
 AC_SUBST([logdir],["$localstatedir/log"])
 
 # default: /usr/local/var/log/trafficserver
-AC_SUBST([pkglogdir],["$logdir/$PACKAGE_TARNAME"])
+AC_SUBST([pkglogdir],["$logdir/trafficserver"])
 
 # default: /usr/local/var/trafficserver
-AC_SUBST([pkglocalstatedir],["$localstatedir/$PACKAGE_TARNAME"])
+AC_SUBST([pkglocalstatedir],["$localstatedir/trafficserver"])
 
 # default: /usr/local/etc/trafficserver
-AC_SUBST([pkgsysconfdir],["$sysconfdir/$PACKAGE_TARNAME"])
+AC_SUBST([pkgsysconfdir],["$sysconfdir/trafficserver"])
 
 # default: /usr/local/libexec/trafficserver
-AC_SUBST([pkglibexecdir],["$libexecdir/$PACKAGE_TARNAME"])
+AC_SUBST([pkglibexecdir],["$libexecdir/trafficserver"])
+
+# default: /usr/local/share/trafficserver
+AC_SUBST([pkgdatadir],["$datadir/trafficserver"])
 
 # -----------------------------------------------------------------------------
 # 3. CHECK FOR PROGRAMS

Propchange: incubator/trafficserver/traffic/tags/2.0.0-alpha/m4/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar  2 03:18:12 2010
@@ -0,0 +1,5 @@
+ltsugar.m4
+libtool.m4
+ltversion.m4
+lt~obsolete.m4
+ltoptions.m4

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/Makefile.am (original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/Makefile.am Tue Mar  2 03:18:12
2010
@@ -394,19 +394,24 @@
 
 test_xml_parser_SOURCES = test_xml_parser.cc InkXml.cc DiagsConfig.cc
 
-versiondir = $(pkglocalstatedir)
+versiondir = $(DESTDIR)$(pkglocalstatedir)
 dist_version_DATA = TS_version
 
-install-exec-local:
+install-data-local:
 	$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir)
$(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgsysconfdir)/internal
-	$(INSTALL) -d $(DESTDIR)$(pkglibexecdir)
 
-uninstall-local:
-	-rm -rf $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgsysconfdir)
$(DESTDIR)$(pkglibexecdir)
+install-data-hook:
+	chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir)
+	-echo $(DESTDIR)$(prefix) > $(DESTDIR)$(prefix)/etc/traffic_server
+
+install-exec-local:
+	$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglibexecdir)
 
 install-exec-hook:
-	chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkglibexecdir)
$(DESTDIR)$(pkgdatadir)
-	-echo $(DESTDIR)$(prefix) > $(DESTDIR)$(prefix)/etc/traffic_server
+	chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkglibexecdir)
 
 uninstall-hook:
+	-rm -rf $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgsysconfdir)
$(DESTDIR)$(pkglibexecdir)
 	-rm -f $(DESTDIR)$(prefix)/etc/traffic_server
+
+

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/Makefile.am (original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/Makefile.am Tue Mar
 2 03:18:12 2010
@@ -19,7 +19,7 @@
 
 SUBDIRS = agent-installer charting configure images include monitor mrtg tune
 
-install-exec-local:
+install-data-local:
 	$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkgdatadir) \
 	$(DESTDIR)$(pkgdatadir)/agent-installer \
 	$(DESTDIR)$(pkgdatadir)/charting \
@@ -31,10 +31,10 @@
 	$(DESTDIR)$(pkgdatadir)/mrtg \
 	$(DESTDIR)$(pkgdatadir)/tune
 
-uninstall-local:
+uninstall-hook:
 	-rm -rf $(DESTDIR)$(pkgdatadir)
 
-webuidir = $(pkgdatadir)
+webuidir = $(DESTDIR)$(pkgdatadir)
 dist_webui_DATA = \
 	checkCookies.ink \
 	enableCookies.ink \

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/agent-installer/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/agent-installer/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/agent-installer/Makefile.am
(original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/agent-installer/Makefile.am
Tue Mar  2 03:18:12 2010
@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 
-webuidir = $(pkgdatadir)/agent-installer
+webuidir = $(DESTDIR)$(pkgdatadir)/agent-installer
 dist_webui_DATA = \
 	ftp.exp \
 	ftp.pl \

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/charting/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/charting/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/charting/Makefile.am
(original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/charting/Makefile.am
Tue Mar  2 03:18:12 2010
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-webuidir = $(pkgdatadir)/charting
+webuidir = $(DESTDIR)$(pkgdatadir)/charting
 dist_webui_DATA = \
 	Bandwidth_Savings.html \
 	Cache_Percent_Free.html \

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/configure/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/configure/Makefile.am
(original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/configure/Makefile.am
Tue Mar  2 03:18:12 2010
@@ -16,7 +16,7 @@
 
 SUBDIRS = helper
 
-webuidir = $(pkgdatadir)/configure
+webuidir = $(DESTDIR)$(pkgdatadir)/configure
 dist_webui_DATA = \
 	c_autoconf_pac.ink \
 	c_autoconf_wpad.ink \

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/configure/helper/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/configure/helper/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/configure/helper/Makefile.am
(original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/configure/helper/Makefile.am
Tue Mar  2 03:18:12 2010
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-webuidir = $(pkgdatadir)/configure/helper
+webuidir = $(DESTDIR)$(pkgdatadir)/configure/helper
 dist_webui_DATA = \
 	INKMgmtAPICheckTcl.sh \
 	INKMgmtAPIFtp.tcl \

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/images/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/images/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/images/Makefile.am
(original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/images/Makefile.am
Tue Mar  2 03:18:12 2010
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-webuidir = $(pkgdatadir)/images
+webuidir = $(DESTDIR)$(pkgdatadir)/images
 dist_webui_DATA = \
 	arrow_add.gif \
 	arrow_cross.gif \

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/include/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/include/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/include/Makefile.am
(original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/include/Makefile.am
Tue Mar  2 03:18:12 2010
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-webuidir = $(pkgdatadir)/include
+webuidir = $(DESTDIR)$(pkgdatadir)/include
 dist_webui_DATA = \
 	body_footer.ink \
 	body_header.ink \

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/monitor/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/monitor/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/monitor/Makefile.am
(original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/monitor/Makefile.am
Tue Mar  2 03:18:12 2010
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-webuidir = $(pkgdatadir)/monitor
+webuidir = $(DESTDIR)$(pkgdatadir)/monitor
 dist_webui_DATA = \
 	m_alarm.ink \
 	m_blue_bar.ink \

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/mrtg/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/mrtg/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/mrtg/Makefile.am (original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/mrtg/Makefile.am Tue
Mar  2 03:18:12 2010
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-webuidir = $(pkgdatadir)/mrtg
+webuidir = $(DESTDIR)$(pkgdatadir)/mrtg
 dist_webui_DATA = \
 	detailed.ink \
 	overview.ink
\ No newline at end of file

Modified: incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/tune/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/tune/Makefile.am?rev=917851&r1=917850&r2=917851&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/tune/Makefile.am (original)
+++ incubator/trafficserver/traffic/tags/2.0.0-alpha/proxy/mgmt2/html2/tune/Makefile.am Tue
Mar  2 03:18:12 2010
@@ -16,7 +16,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-webuidir = $(pkgdatadir)/tune
+webuidir = $(DESTDIR)$(pkgdatadir)/tune
 dist_webui_DATA = \
 	navigation_tree.xmlcpp
 



Mime
View raw message