Merge branch 'jberlin-editor' into editor (resolve pull request)

tuttleofx · Nov 24, 2013 · c02b4c5 · c02b4c5
2 parents 71ea707 + f690ed2
commit c02b4c5
Show file tree

Hide file tree

Showing 132 changed files with 1,675 additions and 713 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,18 @@
-# (c) Disney Enterprises, Inc.  All rights reserved.
+
+# Copyright Disney Enterprises, Inc.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License
+# and the following modification to it: Section 6 Trademarks.
+# deleted and replaced with:
 #
-# This file is licensed under the terms of the Microsoft Public License (MS-PL)
-# as defined at: http://opensource.org/licenses/MS-PL.
+# 6. Trademarks. This License does not grant permission to use the
+# trade names, trademarks, service marks, or product names of the
+# Licensor and its affiliates, except as required for reproducing
+# the content of the NOTICE file.
 #
-# A complete copy of this license is included in this distribution as the file
-# LICENSE.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
 
 ## CMake compatibility issues: don't modify this, please!
 CMAKE_MINIMUM_REQUIRED( VERSION 2.4.6 ) 
@@ -32,6 +40,7 @@ include(src/build/macros.cmake)
 
 ## Setup platform specific helper defines build variants
 IF(WIN32)
+  include (GenerateExportHeader)
   ADD_DEFINITIONS (-DSEEXPR_WIN32)
 ELSE(WIN32)
   ADD_DEFINITIONS (-Wall  -Wextra)
@@ -69,11 +78,11 @@ IF (NOT DEFINED CMAKE_INSTALL_PREFIX)
    SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/${VARIANT_DIRECTORY}-${FLAVORDIR}")
 ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
 
-## Make modules able to see partio library
-# Setup environment variable to link partio
+## Make modules able to see seexpr library
+# Setup environment variable to link seexpr
 SET( SEEXPR_LIBRARIES SeExpr )
 SET( SEEXPR_EDITOR_LIBRARIES SeExprEditor )
-# make it so partio can be found
+# make it so seexpr can be found
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/SeExpr )
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/SeExprEditor )
 

diff --git a/LICENSE b/LICENSE
diff --git a/src/SeExpr/CMakeLists.txt b/src/SeExpr/CMakeLists.txt
@@ -1,10 +1,18 @@
-# (c) Disney Enterprises, Inc.  All rights reserved.
+
+# Copyright Disney Enterprises, Inc.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License
+# and the following modification to it: Section 6 Trademarks.
+# deleted and replaced with:
 #
-# This file is licensed under the terms of the Microsoft Public License (MS-PL)
-# as defined at: http://opensource.org/licenses/MS-PL.
+# 6. Trademarks. This License does not grant permission to use the
+# trade names, trademarks, service marks, or product names of the
+# Licensor and its affiliates, except as required for reproducing
+# the content of the NOTICE file.
 #
-# A complete copy of this license is included in this distribution as the file
-# LICENSE.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
 
 FILE(GLOB io_cpp "*.cpp")
 

diff --git a/src/SeExpr/SeCurve.cpp b/src/SeExpr/SeCurve.cpp
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 #include "SeExpression.h"
 #include "SeExprBuiltins.h"

diff --git a/src/SeExpr/SeCurve.h b/src/SeExpr/SeCurve.h
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 #ifndef _CurveData_h_
 #define _CurveData_h_

diff --git a/src/SeExpr/SeExprBuiltins.cpp b/src/SeExpr/SeExprBuiltins.cpp
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 
 #define __STDC_LIMIT_MACROS

diff --git a/src/SeExpr/SeExprBuiltins.h b/src/SeExpr/SeExprBuiltins.h
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 
 #ifndef SeExprBuiltins_h

diff --git a/src/SeExpr/SeExprFunc.cpp b/src/SeExpr/SeExprFunc.cpp
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 #include <string>
 #include <map>

diff --git a/src/SeExpr/SeExprFunc.h b/src/SeExpr/SeExprFunc.h
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 #ifndef SeExprFunc_h
 #define SeExprFunc_h

diff --git a/src/SeExpr/SeExprMacros.h b/src/SeExpr/SeExprMacros.h
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 
 #ifndef SeExprMacros_h

diff --git a/src/SeExpr/SeExprNode.cpp b/src/SeExpr/SeExprNode.cpp
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 
 /* Parse tree nodes - this is where the expression evaluation happens.

diff --git a/src/SeExpr/SeExprNode.h b/src/SeExpr/SeExprNode.h
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 
 #ifndef SeExprNode_h

diff --git a/src/SeExpr/SeExprParser.h b/src/SeExpr/SeExprParser.h
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 #ifndef SeExprParser_h
 #define SeExprParser_h

diff --git a/src/SeExpr/SeExprParser.y b/src/SeExpr/SeExprParser.y
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 
 %{

diff --git a/src/SeExpr/SeExprParserLex.l b/src/SeExpr/SeExprParserLex.l
@@ -1,11 +1,18 @@
 /*
-* (c) Disney Enterprises, Inc.  All rights reserved.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
 *
-* This file is licensed under the terms of the Microsoft Public License (MS-PL)
-* as defined at: http://opensource.org/licenses/MS-PL.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
 *
-* A complete copy of this license is included in this distribution as the file
-* LICENSE.
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 
 /* Don't generate yywrap since everything is in one string */