update links in .html files

APS Jenkins adjustment
Fix VxWorks builds
2013-09-10 16:53:21 -04:00 · 2013-09-05 12:24:38 -05:00 · 2013-09-05 10:26:56 -05:00 · 2013-09-03 08:37:28 -04:00
10 changed files with 16 additions and 9 deletions
--- a/.hgtags
+++ b/.hgtags
@@ -7,3 +7,4 @@ a29729ca0ecd60b66f2d997031d97911377e44a7 marchtest
 d70c5ad29163306f50979a95b5aebbe9a93cfe76 2.0-BETA
 4cecd4b200f88ab57bbb81978c45df2a67bbece1 3.0-pre1
 4cecd4b200f88ab57bbb81978c45df2a67bbece1 3.0.0
+2a289ff41e2ed3a0247877306c2db7b266f3b6b8 3.0.1
--- a/documentation/pvDataCPP.html
+++ b/documentation/pvDataCPP.html
@@ -68,7 +68,7 @@ license.</a></p>
 storage, access, and communication, of structured data. It is specifically the
 C++ implementation of pvData, which is one part of the set of related products in the EPICS
 V4 control system programming environment:<br />
-<a href="http://epics-pvdata.sourceforge.net/relatedDocumemntsV4.html">relatedDocumentsV4.html</a>
+<a href="http://epics-pvdata.sourceforge.net/relatedDocumentsV4.html">relatedDocumentsV4.html</a>
 </p>


--- a/documentation/pvDataCPP_20120927.html
+++ b/documentation/pvDataCPP_20120927.html
@@ -66,7 +66,7 @@ license.</a></p>
 storage, access, and communication, of structured data. It is specifically the
 C++ implementation of pvData, which is one part of the set of related products in the EPICS
 V4 control system programming environment:<br />
-<a href="http://epics-pvdata.sourceforge.net/relatedDocumemntsV4.html">relatedDocumentsV4.html</a>
+<a href="http://epics-pvdata.sourceforge.net/relatedDocumentsV4.html">relatedDocumentsV4.html</a>
 </p>

 <h2 class="nocount">Status of this Document</h2>
--- a/documentation/pvDataCPP_20121001.html
+++ b/documentation/pvDataCPP_20121001.html
@@ -68,7 +68,7 @@ license.</a></p>
 storage, access, and communication, of structured data. It is specifically the
 C++ implementation of pvData, which is one part of the set of related products in the EPICS
 V4 control system programming environment:<br />
-<a href="http://epics-pvdata.sourceforge.net/relatedDocumemntsV4.html">relatedDocumentsV4.html</a>
+<a href="http://epics-pvdata.sourceforge.net/relatedDocumentsV4.html">relatedDocumentsV4.html</a>
 </p>

 <h2 class="nocount">Status of this Document</h2>
--- a/documentation/pvDataCPP_20121026.html
+++ b/documentation/pvDataCPP_20121026.html
@@ -68,7 +68,7 @@ license.</a></p>
 storage, access, and communication, of structured data. It is specifically the
 C++ implementation of pvData, which is one part of the set of related products in the EPICS
 V4 control system programming environment:<br />
-<a href="http://epics-pvdata.sourceforge.net/relatedDocumemntsV4.html">relatedDocumentsV4.html</a>
+<a href="http://epics-pvdata.sourceforge.net/relatedDocumentsV4.html">relatedDocumentsV4.html</a>
 </p>

 <h2 class="nocount">Status of this Document</h2>
--- a/documentation/pvDataCPP_20121212.html
+++ b/documentation/pvDataCPP_20121212.html
@@ -68,7 +68,7 @@ license.</a></p>
 storage, access, and communication, of structured data. It is specifically the
 C++ implementation of pvData, which is one part of the set of related products in the EPICS
 V4 control system programming environment:<br />
-<a href="http://epics-pvdata.sourceforge.net/relatedDocumemntsV4.html">relatedDocumentsV4.html</a>
+<a href="http://epics-pvdata.sourceforge.net/relatedDocumentsV4.html">relatedDocumentsV4.html</a>
 </p>

 <h2 class="nocount">Status of this Document</h2>
--- a/documentation/pvDataCPP_20130516.html
+++ b/documentation/pvDataCPP_20130516.html
@@ -68,7 +68,7 @@ license.</a></p>
 storage, access, and communication, of structured data. It is specifically the
 C++ implementation of pvData, which is one part of the set of related products in the EPICS
 V4 control system programming environment:<br />
-<a href="http://epics-pvdata.sourceforge.net/relatedDocumemntsV4.html">relatedDocumentsV4.html</a>
+<a href="http://epics-pvdata.sourceforge.net/relatedDocumentsV4.html">relatedDocumentsV4.html</a>
 </p>


--- a/jenkins/aps_build
+++ b/jenkins/aps_build
@@ -4,7 +4,7 @@
 # Jenkins invokes scripts with the "-ex" option. So the build is considered a failure
 # if any of the commands exits with a non-zero exit code.
 #
-# Author: Ralph Lange <Ralph.Lange@gmx.de> and Andrew Johnson <anj@aps.anl.gov>
+# Authors: Ralph Lange <Ralph.Lange@gmx.de> and Andrew Johnson <anj@aps.anl.gov>
 # Copyright (C) 2013 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
 # All rights reserved. Use is subject to license terms.

@@ -19,7 +19,7 @@ PVCOMMON=${HOME}/jobs/epics-pvCommon/workspace
 EPICS_BASE=${EPICS_BASE}
 EOF

-make distclean all
+make

 ###########################################
 # Test
--- a/pvDataApp/pv/pvData.h
+++ b/pvDataApp/pv/pvData.h
@@ -18,6 +18,11 @@
 #include <iomanip>
 #include <pv/pvIntrospect.h>
 #include <pv/requester.h>
+
+#if defined(__vxworks) && !defined(_WRS_VXWORKS_MAJOR)
+typedef class std::ios std::ios_base;
+#endif
+
 namespace epics { namespace pvData { 


--- a/pvDataApp/pv/pvType.h
+++ b/pvDataApp/pv/pvType.h
@@ -17,7 +17,8 @@
 #include <string>
 #include <vector>

-#ifdef __vxworks
+#if defined(__vxworks) && \
+    (_WRS_VXWORKS_MAJOR+0 <= 6) && (_WRS_VXWORKS_MINOR+0 < 9)
 typedef int intptr_t;
 typedef unsigned int uintptr_t;
 #define INT64_MAX (0x7fffffffffffffffLL)
Author	SHA1	Message	Date
Marty Kraimer	fa7a44f5b3	update links in .html files	2013-09-10 16:53:21 -04:00
Andrew Johnson	fb0329c0b5	APS Jenkins adjustment	2013-09-05 12:24:38 -05:00
Andrew Johnson	c3d04fdd08	Fix VxWorks builds	2013-09-05 10:26:56 -05:00
Marty Kraimer	ebb0c97c51	Added tag 3.0.1 for changeset 2a289ff41e2e	2013-09-03 08:37:28 -04:00