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.
git-svn-id: https://svn.apache.org/repos/asf/uima/uimacpp/trunk@1237844 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE.4src b/NOTICE
similarity index 87%
rename from NOTICE.4src
rename to NOTICE
index 7cc19d0..73d61b2 100644
--- a/NOTICE.4src
+++ b/NOTICE
@@ -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/).
diff --git a/NOTICE.4sdk b/NOTICE.4bin
similarity index 90%
rename from NOTICE.4sdk
rename to NOTICE.4bin
index 35b4387..20223d0 100644
--- a/NOTICE.4sdk
+++ b/NOTICE.4bin
@@ -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 @@
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 @@
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.
diff --git a/README.4sdk b/README.4bin
similarity index 100%
rename from README.4sdk
rename to README.4bin
diff --git a/README.4src b/README.4src
index f423b42..f508a89 100644
--- a/README.4src
+++ b/README.4src
@@ -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 @@
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:
---------------------------------
diff --git a/buildSrcTree.cmd b/buildSrcTree.cmd
index a896e0a..d36f8da 100644
--- a/buildSrcTree.cmd
+++ b/buildSrcTree.cmd
@@ -87,14 +87,13 @@
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
diff --git a/buildsdk.cmd b/buildsdk.cmd
index 431efa3..47bcb71 100644
--- a/buildsdk.cmd
+++ b/buildsdk.cmd
@@ -246,12 +246,12 @@
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
diff --git a/createRelease.txt b/createRelease.txt
index aea0114..6ff47c9 100644
--- a/createRelease.txt
+++ b/createRelease.txt
@@ -154,5 +154,7 @@
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
+
