You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bh...@apache.org on 2012/01/30 18:51:43 UTC

svn commit: r1237844 - in /uima/uimacpp/trunk: NOTICE NOTICE.4bin NOTICE.4sdk NOTICE.4src README.4bin README.4sdk README.4src buildSrcTree.cmd buildsdk.cmd createRelease.txt

Author: bhavani
Date: Mon Jan 30 17:51:42 2012
New Revision: 1237844

URL: http://svn.apache.org/viewvc?rev=1237844&view=rev
Log:
UIMA-2314 renamed NOTICE.4src to NOTICE, updated copyright enddate, renamed 4sdk to 4bin, cleaned up duplicate entries in NOTICE.4sdk, updated 64-bit build gcc version in README.4src.

Added:
    uima/uimacpp/trunk/NOTICE
      - copied, changed from r1237536, uima/uimacpp/trunk/NOTICE.4src
    uima/uimacpp/trunk/NOTICE.4bin
      - copied, changed from r1237536, uima/uimacpp/trunk/NOTICE.4sdk
    uima/uimacpp/trunk/README.4bin
      - copied unchanged from r1237536, uima/uimacpp/trunk/README.4sdk
Removed:
    uima/uimacpp/trunk/NOTICE.4sdk
    uima/uimacpp/trunk/NOTICE.4src
    uima/uimacpp/trunk/README.4sdk
Modified:
    uima/uimacpp/trunk/README.4src
    uima/uimacpp/trunk/buildSrcTree.cmd
    uima/uimacpp/trunk/buildsdk.cmd
    uima/uimacpp/trunk/createRelease.txt

Copied: uima/uimacpp/trunk/NOTICE (from r1237536, uima/uimacpp/trunk/NOTICE.4src)
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/NOTICE?p2=uima/uimacpp/trunk/NOTICE&p1=uima/uimacpp/trunk/NOTICE.4src&r1=1237536&r2=1237844&rev=1237844&view=diff
==============================================================================
--- uima/uimacpp/trunk/NOTICE.4src (original)
+++ uima/uimacpp/trunk/NOTICE Mon Jan 30 17:51:42 2012
@@ -1,5 +1,5 @@
 Apache UIMA
-Copyright 2007, 2009 The Apache Software Foundation
+Copyright 2007, 2009, 2012 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Copied: uima/uimacpp/trunk/NOTICE.4bin (from r1237536, uima/uimacpp/trunk/NOTICE.4sdk)
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/NOTICE.4bin?p2=uima/uimacpp/trunk/NOTICE.4bin&p1=uima/uimacpp/trunk/NOTICE.4sdk&r1=1237536&r2=1237844&rev=1237844&view=diff
==============================================================================
--- uima/uimacpp/trunk/NOTICE.4sdk (original)
+++ uima/uimacpp/trunk/NOTICE.4bin Mon Jan 30 17:51:42 2012
@@ -1,5 +1,5 @@
 Apache UIMA
-Copyright 2007, 2009 The Apache Software Foundation
+Copyright 2007, 2009, 2012 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -19,9 +19,6 @@ This product include the software, APR 1
 Apache Portable Runtime
 Copyright (c) 2009 The Apache Software Foundation.
 
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
 Portions of this software were developed at the National Center
 for Supercomputing Applications (NCSA) at the University of
 Illinois at Urbana-Champaign.
@@ -32,7 +29,6 @@ Inc. MD5 Message-Digest Algorithm.
 This software contains code derived from UNIX V7, Copyright(C)
 Caldera International Inc.
 
-
 This product includes the software, Apache Xerces 
 Portions of this software were originally based on the following:
      - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. 

Modified: uima/uimacpp/trunk/README.4src
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/README.4src?rev=1237844&r1=1237843&r2=1237844&view=diff
==============================================================================
--- uima/uimacpp/trunk/README.4src (original)
+++ uima/uimacpp/trunk/README.4src Mon Jan 30 17:51:42 2012
@@ -1,5 +1,5 @@
 
-See the NOTICE file for licensing information.
+See the LICENSE file for licensing information.
 
 --------------------------------
 Building the Apache UIMA C++ SDK
@@ -9,8 +9,6 @@ The Apache UIMA C++ SDK has been built a
 on Linux systems with gcc version 3.4.6 and on Windows 
 using MSVC version 8. 64-bit builds have only been tested on Linux with gcc 4.3.2
 
-64-bit builds have only been tested on Linux with gcc 4.1.0.
-
 
 Setting up the build environment:
 ---------------------------------

Modified: uima/uimacpp/trunk/buildSrcTree.cmd
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/buildSrcTree.cmd?rev=1237844&r1=1237843&r2=1237844&view=diff
==============================================================================
--- uima/uimacpp/trunk/buildSrcTree.cmd (original)
+++ uima/uimacpp/trunk/buildSrcTree.cmd Mon Jan 30 17:51:42 2012
@@ -87,14 +87,13 @@ mkdir %TARGET_DIR%\scriptators\tcl
 echo.
 echo copying from %UIMACPP_SOURCE%
 xcopy /Q %UIMACPP_SOURCE%\buildsdk.cmd %TARGET_DIR%
-xcopy /Q %UIMACPP_SOURCE%\NOTICE.4src %TARGET_DIR%
-ren %TARGET_DIR%\NOTICE.4src NOTICE
+xcopy /Q %UIMACPP_SOURCE%\NOTICE %TARGET_DIR%
 xcopy /Q %UIMACPP_SOURCE%\LICENSE %TARGET_DIR%
 xcopy /Q %UIMACPP_SOURCE%\RELEASE_NOTES.* %TARGET_DIR%
 xcopy /Q %UIMACPP_SOURCE%\README.4src %TARGET_DIR%
 ren %TARGET_DIR%\README.4src README
-xcopy /Q %UIMACPP_SOURCE%\README.4sdk %TARGET_DIR%
-xcopy /Q %UIMACPP_SOURCE%\NOTICE.4sdk %TARGET_DIR%
+xcopy /Q %UIMACPP_SOURCE%\README.4bin %TARGET_DIR%
+xcopy /Q %UIMACPP_SOURCE%\NOTICE.4bin %TARGET_DIR%
 
 echo copying from %UIMACPP_SOURCE%\data
 xcopy /Q  %UIMACPP_SOURCE%\data\*.xsd %TARGET_DIR%\data

Modified: uima/uimacpp/trunk/buildsdk.cmd
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/buildsdk.cmd?rev=1237844&r1=1237843&r2=1237844&view=diff
==============================================================================
--- uima/uimacpp/trunk/buildsdk.cmd (original)
+++ uima/uimacpp/trunk/buildsdk.cmd Mon Jan 30 17:51:42 2012
@@ -246,12 +246,12 @@ echo.
 echo copying licenses...
 
 REM copy Apache licences
-xcopy /Q /Y %UIMA_SOURCE%\NOTICE.4sdk %UIMA_DIR%
-ren %UIMA_DIR%\NOTICE.4sdk NOTICE
+xcopy /Q /Y %UIMA_SOURCE%\NOTICE.4bin %UIMA_DIR%
+ren %UIMA_DIR%\NOTICE.4bin NOTICE
 xcopy /Q /Y %UIMA_SOURCE%\LICENSE %UIMA_DIR%
 xcopy /Q /Y %UIMA_SOURCE%\RELEASE_NOTES.* %UIMA_DIR%
-xcopy /Q /Y %UIMA_SOURCE%\README.4sdk %UIMA_DIR%
-ren %UIMA_DIR%\README.4sdk README
+xcopy /Q /Y %UIMA_SOURCE%\README.4bin %UIMA_DIR%
+ren %UIMA_DIR%\README.4bin README
 
 REM mkdir %UIMA_DIR%\licenses\apr
 REM xcopy /Q /Y %APR_HOME%\LICENSE* %UIMA_DIR%\licenses\apr

Modified: uima/uimacpp/trunk/createRelease.txt
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/createRelease.txt?rev=1237844&r1=1237843&r2=1237844&view=diff
==============================================================================
--- uima/uimacpp/trunk/createRelease.txt (original)
+++ uima/uimacpp/trunk/createRelease.txt Mon Jan 30 17:51:42 2012
@@ -154,5 +154,7 @@ Linux binaries. 
    On Windows zip up uimacpp-2.4.0 and create uimacpp-2.4.0-src.zip
    On Linux tar -zcvf uimacpp-2.4.0-src.tgz uimacpp-2.4.0
 3. rat scan the source directory
-   java -jar apache-rat-0.6.jar uimacpp-2.4.0 > uimacpp-2.4.0-src-report.txt
+   java -jar c:\apache-rat-0.8\apache-rat-0.8.jar -dir uimacpp-2.4.0 -e org_apache*.h *.vcproj createRelease.txt configure *.txt
+ *.sln  *.html *.sh  README* scriptators test examples config  m4 NOTICE*  uimacpp-2.4.0 > uimacpp-2.4.0-src-report.txt
+