[opengtl-commits] [656] change version and port to llvm 2.5

[ Thread Index | Date Index | More lists.tuxfamily.org/opengtl-commits Archives ]

To: opengtl-commits@xxxxxxxxxxxxxxxxxxx
Subject: [opengtl-commits] [656] change version and port to llvm 2.5
From: subversion@xxxxxxxxxxxxx
Date: Tue, 17 Mar 2009 20:50:41 +0100

Revision: 656
Author:   cyrille
Date:     2009-03-17 20:50:41 +0100 (Tue, 17 Mar 2009)

Log Message:
-----------
change version and port to llvm 2.5

Modified Paths:
--------------
    trunk/OpenGTL/CMakeLists.txt
    trunk/OpenGTL/Extensions/CMakeLists.txt
    trunk/OpenGTL/OpenCTL/OpenCTL/CMakeLists.txt
    trunk/OpenGTL/OpenCTL/OpenCTL/Version.h
    trunk/OpenGTL/OpenCTL/tools/benchmark/CtlBenchmark.cpp
    trunk/OpenGTL/OpenCTL/tools/compiler/CtlC.cpp
    trunk/OpenGTL/OpenCTL/tools/interpreter/CtlI.cpp
    trunk/OpenGTL/OpenGTL/CMakeLists.txt
    trunk/OpenGTL/OpenGTL/GTLCore/CMakeLists.txt
    trunk/OpenGTL/OpenGTL/GTLCore/CodeGenerator_p.cpp
    trunk/OpenGTL/OpenGTL/GTLCore/Version.h
    trunk/OpenGTL/OpenGTL/GTLImageIO/CMakeLists.txt
    trunk/OpenGTL/OpenShiva/OpenShiva/CMakeLists.txt
    trunk/OpenGTL/OpenShiva/OpenShiva/Metadata.cpp
    trunk/OpenGTL/OpenShiva/OpenShiva/Version.h
    trunk/OpenGTL/OpenShiva/tools/compiler/ShivaC.cpp
    trunk/OpenGTL/OpenShiva/tools/interpreter/Shiva.cpp
    trunk/OpenGTL/OpenShiva/tools/shivainfo/ShivaInfo.cpp
    trunk/OpenGTL/OpenShiva/tools/tester/ShivaTester.cpp

Modified: trunk/OpenGTL/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/CMakeLists.txt	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/CMakeLists.txt	2009-03-17 19:50:41 UTC (rev 656)
@@ -8,7 +8,7 @@
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
-set(OPENGTL_VERSION "0.9.8")
+set(OPENGTL_VERSION "0.9.9")
 set(OPENGTL_LIB_VERSION ${OPENGTL_VERSION})
 set(OPENGTL_LIB_SOVERSION "0.6")
 
@@ -26,9 +26,9 @@
 configure_file(config-endian.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-endian.h )
 
 find_package(LLVM REQUIRED)
-if( NOT LLVM_VERSION STREQUAL "2.4" )
-  message(FATAL_ERROR "LLVM 2.4 is required.")
-endif(NOT LLVM_VERSION STREQUAL "2.4" )
+if( NOT LLVM_VERSION STREQUAL "2.5" )
+  message(FATAL_ERROR "LLVM 2.5 is required.")
+endif(NOT LLVM_VERSION STREQUAL "2.5" )
 
 if(OPENGTL_BUILD_TESTS)
 include(CTest)

Modified: trunk/OpenGTL/Extensions/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/Extensions/CMakeLists.txt	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/Extensions/CMakeLists.txt	2009-03-17 19:50:41 UTC (rev 656)
@@ -6,5 +6,5 @@
 
 add_subdirectory( RawDC )
 
-add_subdirectory(CtlNode)
-add_subdirectory(ShivaNode)
+# add_subdirectory(CtlNode)
+# add_subdirectory(ShivaNode)

Modified: trunk/OpenGTL/OpenCTL/OpenCTL/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/OpenCTL/OpenCTL/CMakeLists.txt	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenCTL/OpenCTL/CMakeLists.txt	2009-03-17 19:50:41 UTC (rev 656)
@@ -7,6 +7,7 @@
   Module.cpp
   ModulesManager.cpp
   Program.cpp
+  Version.cpp
 # Internal files
   StdLibFunctions.cpp
   compiler/Compiler.cpp
@@ -21,6 +22,7 @@
 
 # __STDC_LIMIT_MACROS is needed by LLVM's DataTypes.h
 add_definitions( "-D__STDC_LIMIT_MACROS" )
+add_definitions( "-D__STDC_CONSTANT_MACROS" )
 add_definitions( -DCOUMPONENT_NAME="OpenCTL" )
 
 add_definitions( -D_OPENCTL_LIB_="${CMAKE_INSTALL_PREFIX}/lib/libOpenCTL.so.${OPENGTL_LIB_SOVERSION}")

Modified: trunk/OpenGTL/OpenCTL/OpenCTL/Version.h
===================================================================
--- trunk/OpenGTL/OpenCTL/OpenCTL/Version.h	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenCTL/OpenCTL/Version.h	2009-03-17 19:50:41 UTC (rev 656)
@@ -20,19 +20,25 @@
 #ifndef _OPENCTL_OPENCTL_H_
 #define _OPENCTL_OPENCTL_H_
 
+#include <GTLCore/Version.h>
+
+#define OPENCTL_VERSION_MAJOR GTL_CORE_VERSION_MAJOR
+#define OPENCTL_VERSION_MINOR GTL_CORE_VERSION_MINOR
+#define OPENCTL_VERSION_REVISION GTL_CORE_VERSION_REVISION
+
 namespace OpenCTL {
-  const char* LibraryShortName = "OpenCTL";
-  const char* LibraryName = "Open Color Transformation Language";
-  const char* LibraryCopyright = "Copyright (c) 2007-2009 Cyrille Berger (cberger@xxxxxxxxxxx)";
-  const char* LibraryLicence = "GNU Lesser General Public License Version 2";
-  const char* LibraryVersionString = "0.9.8";
-  int LibraryVersionMajor = 0;
-  int LibraryVersionMinor = 9;
-  int LibraryVersionRevision = 8;
+  GTLCore::String LibraryShortName();
+  GTLCore::String LibraryName();
+  GTLCore::String LibraryCopyright();
+  GTLCore::String LibraryLicence();
+  GTLCore::String LibraryVersionString();;
+  int LibraryVersionMajor();
+  int LibraryVersionMinor();
+  int LibraryVersionRevision();
   /**
    * Give the latest version of the CTL language supported by this library.
    */
-  int LanguageVersion = 1;
+  int LanguageVersion();
 }
 
 #endif

Modified: trunk/OpenGTL/OpenCTL/tools/benchmark/CtlBenchmark.cpp
===================================================================
--- trunk/OpenGTL/OpenCTL/tools/benchmark/CtlBenchmark.cpp	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenCTL/tools/benchmark/CtlBenchmark.cpp	2009-03-17 19:50:41 UTC (rev 656)
@@ -97,9 +97,9 @@
 
 void printVersion()
 {
-  std::cout << OpenCTL::LibraryShortName << " - " << OpenCTL::LibraryName << " - " << OpenCTL::LibraryVersionString << std::endl;
-  std::cout << OpenCTL::LibraryCopyright << std::endl;
-  std::cout << "CTL Version : " << OpenCTL::LanguageVersion << std::endl;
+  std::cout << OpenCTL::LibraryShortName() << " - " << OpenCTL::LibraryName() << " - " << OpenCTL::LibraryVersionString() << std::endl;
+  std::cout << OpenCTL::LibraryCopyright() << std::endl;
+  std::cout << "CTL Version : " << OpenCTL::LanguageVersion() << std::endl;
 }
 void printHelp()
 {

Modified: trunk/OpenGTL/OpenCTL/tools/compiler/CtlC.cpp
===================================================================
--- trunk/OpenGTL/OpenCTL/tools/compiler/CtlC.cpp	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenCTL/tools/compiler/CtlC.cpp	2009-03-17 19:50:41 UTC (rev 656)
@@ -29,9 +29,9 @@
 
 void printVersion()
 {
-  std::cout << OpenCTL::LibraryShortName << " - " << OpenCTL::LibraryName << " - " << OpenCTL::LibraryVersionString << std::endl;
-  std::cout << OpenCTL::LibraryCopyright << std::endl;
-  std::cout << "CTL Version : " << OpenCTL::LanguageVersion << std::endl;
+  std::cout << OpenCTL::LibraryShortName() << " - " << OpenCTL::LibraryName() << " - " << OpenCTL::LibraryVersionString() << std::endl;
+  std::cout << OpenCTL::LibraryCopyright() << std::endl;
+  std::cout << "CTL Version : " << OpenCTL::LanguageVersion() << std::endl;
 }
 void printHelp()
 {

Modified: trunk/OpenGTL/OpenCTL/tools/interpreter/CtlI.cpp
===================================================================
--- trunk/OpenGTL/OpenCTL/tools/interpreter/CtlI.cpp	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenCTL/tools/interpreter/CtlI.cpp	2009-03-17 19:50:41 UTC (rev 656)
@@ -32,9 +32,9 @@
 
 void printVersion()
 {
-  std::cout << OpenCTL::LibraryShortName << " - " << OpenCTL::LibraryName << " - " << OpenCTL::LibraryVersionString << std::endl;
-  std::cout << OpenCTL::LibraryCopyright << std::endl;
-  std::cout << "CTL Version : " << OpenCTL::LanguageVersion << std::endl;
+  std::cout << OpenCTL::LibraryShortName() << " - " << OpenCTL::LibraryName() << " - " << OpenCTL::LibraryVersionString() << std::endl;
+  std::cout << OpenCTL::LibraryCopyright() << std::endl;
+  std::cout << "CTL Version : " << OpenCTL::LanguageVersion() << std::endl;
 }
 void printHelp()
 {

Modified: trunk/OpenGTL/OpenGTL/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/OpenGTL/CMakeLists.txt	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenGTL/CMakeLists.txt	2009-03-17 19:50:41 UTC (rev 656)
@@ -5,5 +5,5 @@
 add_subdirectory(GTLCore)
 add_subdirectory(GTLTest)
 add_subdirectory(GTLImageIO)
-add_subdirectory(GTLGlue)
+# add_subdirectory(GTLGlue)
 add_subdirectory(tools)

Modified: trunk/OpenGTL/OpenGTL/GTLCore/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/CMakeLists.txt	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenGTL/GTLCore/CMakeLists.txt	2009-03-17 19:50:41 UTC (rev 656)
@@ -28,6 +28,7 @@
   Type.cpp
   TypesManager.cpp
   Value.cpp
+  Version.cpp
 # Internal files
   wrappers/Allocate.cpp
   AST/AccessorExpression.cpp
@@ -84,6 +85,7 @@
 
 # __STDC_LIMIT_MACROS is needed by LLVM's DataTypes.h
 add_definitions( "-D__STDC_LIMIT_MACROS" )
+add_definitions( "-D__STDC_CONSTANT_MACROS" )
 add_definitions( -DCOUMPONENT_NAME="GTLCore" )
 
 # installation

Modified: trunk/OpenGTL/OpenGTL/GTLCore/CodeGenerator_p.cpp
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/CodeGenerator_p.cpp	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenGTL/GTLCore/CodeGenerator_p.cpp	2009-03-17 19:50:41 UTC (rev 656)
@@ -208,7 +208,7 @@
   GTL_ASSERT(_value->getType()->isFirstClassType());
   GTL_ASSERT( _targetType->dataType() != Type::ARRAY );
   GTL_ASSERT( _targetType->dataType() != Type::STRUCTURE );
-  return llvm::CastInst::create(
+  return llvm::CastInst::Create(
                       llvm::CastInst::getCastOpcode(_value, _valueType->isSigned(), _targetType->d->type(), _targetType->isSigned()), _value, _targetType->d->type(), "", _currentBlock );
 }
 
@@ -397,11 +397,11 @@
     CREATE_BINARY_OPERATOR(  _GTL_Function_Name_, v1, v2); \
   }
 
-CREATE_BINARY_EXPRESSION(createAdditionExpression, getAdd, createAdd)
-CREATE_BINARY_EXPRESSION(createSubstractionExpression, getSub, createSub)
-CREATE_BINARY_EXPRESSION(createMultiplicationExpression, getMul, createMul)
-CREATE_BINARY_EXPRESSION(createRightShiftExpression, getAShr, createAShr);
-CREATE_BINARY_EXPRESSION(createLeftShiftExpression, getShl, createShl);
+CREATE_BINARY_EXPRESSION(createAdditionExpression, getAdd, CreateAdd)
+CREATE_BINARY_EXPRESSION(createSubstractionExpression, getSub, CreateSub)
+CREATE_BINARY_EXPRESSION(createMultiplicationExpression, getMul, CreateMul)
+CREATE_BINARY_EXPRESSION(createRightShiftExpression, getAShr, CreateAShr)
+CREATE_BINARY_EXPRESSION(createLeftShiftExpression, getShl, CreateShl)
 
 
 llvm::Value* CodeGenerator::createDivisionExpression(llvm::BasicBlock* currentBlock, llvm::Value* lhs, const Type* lhsType, llvm::Value* rhs, const Type* rhsType)
@@ -411,9 +411,9 @@
       or ( lhsType->dataType() == GTLCore::Type::VECTOR
            and lhsType->embeddedType()->dataType() == GTLCore::Type::FLOAT ) )
   {
-    return llvm::BinaryOperator::createFDiv(v1, v2, "", currentBlock );
+    return llvm::BinaryOperator::CreateFDiv(v1, v2, "", currentBlock );
   } else {
-    return llvm::BinaryOperator::createSDiv(v1, v2, "", currentBlock );
+    return llvm::BinaryOperator::CreateSDiv(v1, v2, "", currentBlock );
   }
 }
 
@@ -439,7 +439,7 @@
 llvm::Value* CodeGenerator::createModuloExpression(llvm::BasicBlock* currentBlock, llvm::Value* lhs, const Type* lhsType, llvm::Value* rhs, const Type* rhsType)
 {
   UNIFORMIZE_VALUE_TYPES( lhs, rhs );
-  return llvm::BinaryOperator::createSRem( v1, v2, "", currentBlock );
+  return llvm::BinaryOperator::CreateSRem( v1, v2, "", currentBlock );
 }
 
 llvm::Constant* CodeGenerator::createModuloExpression( llvm::Constant* lhs, const Type* lhsType, llvm::Constant* rhs, const Type* rhsType)
@@ -472,8 +472,8 @@
     CREATE_BINARY_OPERATOR(  _GTL_Function_Name_, v1, v2); \
   }
 
-CREATE_BINARY_EXPRESSION(createOrExpression, getOr, createOr)
-CREATE_BINARY_EXPRESSION(createAndExpression, getAnd, createAnd)
+CREATE_BINARY_EXPRESSION(createOrExpression, getOr, CreateOr)
+CREATE_BINARY_EXPRESSION(createAndExpression, getAnd, CreateAnd)
 
 #define CREATE_BINARY_INTEGER_EXPRESSION(_GTL_Function_Name_, _LLVM_Constant_Expr_, _LLVM_Binary_Operator ) \
   llvm::Value* CodeGenerator::_GTL_Function_Name_(llvm::BasicBlock* currentBlock, llvm::Value* lhs, const Type* lhsType, llvm::Value* rhs, const Type* rhsType) \
@@ -496,9 +496,9 @@
     CREATE_BINARY_OPERATOR(  _GTL_Function_Name_, v1, v2); \
   }
 
-CREATE_BINARY_INTEGER_EXPRESSION(createBitXorExpression, getXor, createXor )
-CREATE_BINARY_INTEGER_EXPRESSION(createBitOrExpression, getOr, createOr )
-CREATE_BINARY_INTEGER_EXPRESSION(createBitAndExpression, getAnd, createAnd )
+CREATE_BINARY_INTEGER_EXPRESSION(createBitXorExpression, getXor, CreateXor )
+CREATE_BINARY_INTEGER_EXPRESSION(createBitOrExpression, getOr, CreateOr )
+CREATE_BINARY_INTEGER_EXPRESSION(createBitAndExpression, getAnd, CreateAnd )
 
 
 #define CREATE_COMPARISON_EXPRESSION(_GTL_Function_Name_, _LLVM_UInt_Expr_, _LLVM_SInt_Expr_, _LLVM_Float_Expr_ ) \
@@ -575,7 +575,7 @@
 
 llvm::Value* CodeGenerator::createMinusExpression(llvm::BasicBlock* currentBlock, llvm::Value* rhs, const Type* rhsType)
 {
-  return llvm::BinaryOperator::createNeg( rhs, "", currentBlock );
+  return llvm::BinaryOperator::CreateNeg( rhs, "", currentBlock );
 }
 
 llvm::Constant* CodeGenerator::createMinusExpression( llvm::Constant* rhs, const Type* rhsType)
@@ -590,7 +590,7 @@
 
 llvm::Value* CodeGenerator::createNotExpression(llvm::BasicBlock* currentBlock, llvm::Value* rhs, const Type* rhsType)
 {
-  return llvm::BinaryOperator::createNot( rhs, "", currentBlock );
+  return llvm::BinaryOperator::CreateNot( rhs, "", currentBlock );
 }
 
 llvm::Constant* CodeGenerator::createNotExpression( llvm::Constant* rhs, const Type* rhsType)
@@ -605,7 +605,7 @@
 
 llvm::Value* CodeGenerator::createTildeExpression(llvm::BasicBlock* currentBlock, llvm::Value* rhs, const Type* rhsType)
 {
-  return llvm::BinaryOperator::createXor( rhs, integerToConstant(0xFFFFFFFF ), "", currentBlock );
+  return llvm::BinaryOperator::CreateXor( rhs, integerToConstant(0xFFFFFFFF ), "", currentBlock );
 }
 
 llvm::Constant* CodeGenerator::createTildeExpression( llvm::Constant* rhs, const Type* rhsType)
@@ -764,7 +764,7 @@
   llvm::Function* func = createGtlMallocFunction( _gc.module()->llvmModule() );
   std::vector<llvm::Value*> params;
   GTL_DEBUG( *_size << "  * " << *llvm::ConstantExpr::getSizeOf( _type ) );
-  params.push_back( llvm::BinaryOperator::createMul( 
+  params.push_back( llvm::BinaryOperator::CreateMul( 
     _size,
     llvm::CastInst::CreateIntegerCast( llvm::ConstantExpr::getSizeOf( _type ),
                                        llvm::Type::Int32Ty, false, "", _bb ), "", _bb  ) );

Modified: trunk/OpenGTL/OpenGTL/GTLCore/Version.h
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/Version.h	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenGTL/GTLCore/Version.h	2009-03-17 19:50:41 UTC (rev 656)
@@ -20,15 +20,21 @@
 #ifndef _GTLCORE_VERSION_H_
 #define _GTLCORE_VERSION_H_
 
+#include <GTLCore/String.h>
+
+#define GTL_CORE_VERSION_MAJOR 0
+#define GTL_CORE_VERSION_MINOR 9
+#define GTL_CORE_VERSION_REVISION 9
+
 namespace GTLCore {
-  const char* LibraryShortName = "OpenGTL Core";
-  const char* LibraryName = "Open Graphics Transformation Languages Core";
-  const char* LibraryCopyright = "Copyright (c) 2007-2009 Cyrille Berger (cberger@xxxxxxxxxxx)";
-  const char* LibraryLicence = "GNU Lesser General Public License Version 2";
-  const char* LibraryVersionString = "0.9.8";
-  int LibraryVersionMajor = 0;
-  int LibraryVersionMinor = 9;
-  int LibraryVersionRevision = 8;
+  String LibraryShortName();
+  String LibraryName();
+  String LibraryCopyright();
+  String LibraryLicence();
+  String LibraryVersionString();;
+  int LibraryVersionMajor();
+  int LibraryVersionMinor();
+  int LibraryVersionRevision();
 }
 
 #endif

Modified: trunk/OpenGTL/OpenGTL/GTLImageIO/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLImageIO/CMakeLists.txt	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenGTL/GTLImageIO/CMakeLists.txt	2009-03-17 19:50:41 UTC (rev 656)
@@ -15,6 +15,7 @@
 
 # __STDC_LIMIT_MACROS is needed by LLVM's DataTypes.h
 add_definitions( "-D__STDC_LIMIT_MACROS" )
+add_definitions( "-D__STDC_CONSTANT_MACROS" )
 add_definitions( -DCOUMPONENT_NAME="GTLImageIO" )
 
 if(OPENGTL_BUILD_TESTS)

Modified: trunk/OpenGTL/OpenShiva/OpenShiva/CMakeLists.txt
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/CMakeLists.txt	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/CMakeLists.txt	2009-03-17 19:50:41 UTC (rev 656)
@@ -6,6 +6,7 @@
   Kernel.cpp
   Source.cpp
   SourcesCollection.cpp
+  Version.cpp
 # Internal files
   Compiler_p.cpp
   CodeGenerator_p.cpp
@@ -34,6 +35,7 @@
 
 # __STDC_LIMIT_MACROS is needed by LLVM's DataTypes.h
 add_definitions( "-D__STDC_LIMIT_MACROS" )
+add_definitions( "-D__STDC_CONSTANT_MACROS" )
 add_definitions( -DCOUMPONENT_NAME="OpenShiva" )
 
 add_definitions( -D_OPENSHIVA_LIB_="${CMAKE_INSTALL_PREFIX}/lib/libOpenShiva.so.${OPENGTL_VERSION}")

Modified: trunk/OpenGTL/OpenShiva/OpenShiva/Metadata.cpp
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/Metadata.cpp	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/Metadata.cpp	2009-03-17 19:50:41 UTC (rev 656)
@@ -57,7 +57,7 @@
 
 Metadata::Metadata( const Entry* _version, const Group* _infoList, const Group* _parametersList ) : Group( "Kernel", createList( _version, _infoList, _parametersList ) ), d(new Private)
 {
-  d->version = LanguageVersion;
+  d->version = LanguageVersion();
   if( _version )
   {
     const ValueEntry* te = _version->asValueEntry();

Modified: trunk/OpenGTL/OpenShiva/OpenShiva/Version.h
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/Version.h	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/Version.h	2009-03-17 19:50:41 UTC (rev 656)
@@ -20,19 +20,26 @@
 #ifndef _OPENSHIVA_VERSION_H_
 #define _OPENSHIVA_VERSION_H_
 
+#include <GTLCore/Version.h>
+
+#define OPENSHIVA_VERSION_MAJOR GTL_CORE_VERSION_MAJOR
+#define OPENSHIVA_VERSION_MINOR GTL_CORE_VERSION_MINOR
+#define OPENSHIVA_VERSION_REVISION GTL_CORE_VERSION_REVISION
+
 namespace OpenShiva {
-  const char* LibraryShortName = "OpenShiva";
-  const char* LibraryName = "OpenShiva Kernel Transformation Language";
-  const char* LibraryCopyright = "Copyright (c) 2007-2009 Cyrille Berger (cberger@xxxxxxxxxxx)";
-  const char* LibraryLicence = "GNU Lesser General Public License Version 2";
-  const char* LibraryVersionString = "0.9.8";
-  int LibraryVersionMajor = 0;
-  int LibraryVersionMinor = 9;
-  int LibraryVersionRevision = 8;
+  GTLCore::String LibraryShortName();
+  GTLCore::String LibraryName();
+  GTLCore::String LibraryCopyright();
+  GTLCore::String LibraryLicence();
+  GTLCore::String LibraryVersionString();;
+  int LibraryVersionMajor();
+  int LibraryVersionMinor();
+  int LibraryVersionRevision();
   /**
    * Give the latest version of the Shiva language supported by this library.
    */
-  int LanguageVersion = 0;
+  int LanguageVersion();
+  int LanguageVersionRevision();
 }
 
 #endif

Modified: trunk/OpenGTL/OpenShiva/tools/compiler/ShivaC.cpp
===================================================================
--- trunk/OpenGTL/OpenShiva/tools/compiler/ShivaC.cpp	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenShiva/tools/compiler/ShivaC.cpp	2009-03-17 19:50:41 UTC (rev 656)
@@ -29,9 +29,9 @@
 
 void printVersion()
 {
-  std::cout << OpenShiva::LibraryShortName << " - " << OpenShiva::LibraryName << " - " << OpenShiva::LibraryVersionString << std::endl;
-  std::cout << OpenShiva::LibraryCopyright << std::endl;
-  std::cout << "Shiva Version : " << OpenShiva::LanguageVersion << std::endl;
+  std::cout << OpenShiva::LibraryShortName() << " - " << OpenShiva::LibraryName() << " - " << OpenShiva::LibraryVersionString() << std::endl;
+  std::cout << OpenShiva::LibraryCopyright() << std::endl;
+  std::cout << "Shiva Version : " << OpenShiva::LanguageVersion() << std::endl;
 }
 void printHelp()
 {

Modified: trunk/OpenGTL/OpenShiva/tools/interpreter/Shiva.cpp
===================================================================
--- trunk/OpenGTL/OpenShiva/tools/interpreter/Shiva.cpp	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenShiva/tools/interpreter/Shiva.cpp	2009-03-17 19:50:41 UTC (rev 656)
@@ -44,9 +44,9 @@
 
 void printVersion()
 {
-  std::cout << OpenShiva::LibraryShortName << " - " << OpenShiva::LibraryName << " - " << OpenShiva::LibraryVersionString << std::endl;
-  std::cout << OpenShiva::LibraryCopyright << std::endl;
-  std::cout << "Shiva Version : " << OpenShiva::LanguageVersion << std::endl;
+  std::cout << OpenShiva::LibraryShortName() << " - " << OpenShiva::LibraryName() << " - " << OpenShiva::LibraryVersionString() << std::endl;
+  std::cout << OpenShiva::LibraryCopyright() << std::endl;
+  std::cout << "Shiva Version : " << OpenShiva::LanguageVersion() << std::endl;
 }
 void printHelp()
 {

Modified: trunk/OpenGTL/OpenShiva/tools/shivainfo/ShivaInfo.cpp
===================================================================
--- trunk/OpenGTL/OpenShiva/tools/shivainfo/ShivaInfo.cpp	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenShiva/tools/shivainfo/ShivaInfo.cpp	2009-03-17 19:50:41 UTC (rev 656)
@@ -34,9 +34,9 @@
 
 void printVersion()
 {
-  std::cout << OpenShiva::LibraryShortName << " - " << OpenShiva::LibraryName << " - " << OpenShiva::LibraryVersionString << std::endl;
-  std::cout << OpenShiva::LibraryCopyright << std::endl;
-  std::cout << "Shiva Version : " << OpenShiva::LanguageVersion << std::endl;
+  std::cout << OpenShiva::LibraryShortName() << " - " << OpenShiva::LibraryName() << " - " << OpenShiva::LibraryVersionString() << std::endl;
+  std::cout << OpenShiva::LibraryCopyright() << std::endl;
+  std::cout << "Shiva Version : " << OpenShiva::LanguageVersion() << std::endl;
 }
 void printHelp()
 {

Modified: trunk/OpenGTL/OpenShiva/tools/tester/ShivaTester.cpp
===================================================================
--- trunk/OpenGTL/OpenShiva/tools/tester/ShivaTester.cpp	2009-03-17 19:49:57 UTC (rev 655)
+++ trunk/OpenGTL/OpenShiva/tools/tester/ShivaTester.cpp	2009-03-17 19:50:41 UTC (rev 656)
@@ -41,9 +41,9 @@
 
 void printVersion()
 {
-  std::cout << OpenShiva::LibraryShortName << " - " << OpenShiva::LibraryName << " - " << OpenShiva::LibraryVersionString << std::endl;
-  std::cout << OpenShiva::LibraryCopyright << std::endl;
-  std::cout << "Shiva Version : " << OpenShiva::LanguageVersion << std::endl;
+  std::cout << OpenShiva::LibraryShortName() << " - " << OpenShiva::LibraryName() << " - " << OpenShiva::LibraryVersionString() << std::endl;
+  std::cout << OpenShiva::LibraryCopyright() << std::endl;
+  std::cout << "Shiva Version : " << OpenShiva::LanguageVersion() << std::endl;
 }
 void printHelp()
 {

Messages sorted by: [ date | thread ]
Prev by Date: [opengtl-commits] [655] restore opengtl...
Next by Date: [opengtl-commits] [657] add missing files
Previous by thread: [opengtl-commits] [655] restore opengtl...
Next by thread: [opengtl-commits] [657] add missing files

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/