updated license + minor structuring

galek · Jan 10, 2010 · 2605c0e · 2605c0e
1 parent db1d400
commit 2605c0e
Show file tree

Hide file tree

Showing 30 changed files with 118 additions and 82 deletions.
diff --git a/Samples/Advanced/Advanced.cpp b/Samples/Advanced/Advanced.cpp
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Samples/Advanced/Main.cpp b/Samples/Advanced/Main.cpp
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Samples/Advanced/Shared.h b/Samples/Advanced/Shared.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Samples/MainLoop/MainLoop.cpp b/Samples/MainLoop/MainLoop.cpp
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Samples/Simple/Simple.cpp b/Samples/Simple/Simple.cpp
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/include/Shiny.h b/Shiny/include/Shiny.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/include/ShinyConfig.h b/Shiny/include/ShinyConfig.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -26,15 +26,6 @@ THE SOFTWARE.
 #define SHINY_CONFIG_H
 
 
-/*---------------------------------------------------------------------------*/
-
-#define SHINY_VERSION "2.5"
-#define SHINY_SHORTNAME "Shiny"
-#define SHINY_FULLNAME "Shiny Profiler"
-#define SHINY_COPYRIGHT "Copyright (C) 2007-2009 Aidin Abedi"
-#define SHINY_DESCRIPTION "Shiny is a elegent profiler designed to help finding bottlenecks in your project."
-
-
 /*---------------------------------------------------------------------------*/
 
 /* SHINY_IS_COMPILED is the master on or off swith at compile time. Define it to TRUE or FALSE before including header Shiny.h or inside ShinyConfig.h. Default is TRUE.
@@ -79,49 +70,4 @@ THE SOFTWARE.
 #define SHINY_OUTPUT_MODE SHINY_OUTPUT_MODE_BOTH
 #endif
 
-
-/*---------------------------------------------------------------------------*/
-
-#ifndef FALSE
-#define FALSE 0x0
-#endif
-
-#ifndef TRUE
-#define TRUE 0x1
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-
-/*---------------------------------------------------------------------------*/
-
-#define SHINY_PLATFORM_WIN32 0x1
-#define SHINY_PLATFORM_POSIX 0x2
-
-#if defined (_WIN32)
-# define SHINY_PLATFORM SHINY_PLATFORM_WIN32
-
-#else /* ASSUME: POSIX-compliant OS */
-# define SHINY_PLATFORM SHINY_PLATFORM_POSIX
-#endif
-
-
-/*---------------------------------------------------------------------------*/
-
-#define SHINY_COMPILER_MSVC 0x1
-#define SHINY_COMPILER_GNUC 0x2
-#define SHINY_COMPILER_OTHER 0x3
-
-#if defined (_MSC_VER)
-# define SHINY_COMPILER SHINY_COMPILER_MSVC
-
-#elif defined (__GNUG__)
-# define SHINY_COMPILER SHINY_COMPILER_GNUC
-
-#else
-# define SHINY_COMPILER SHINY_COMPILER_OTHER
-#endif
-
 #endif /* end of include guard */
diff --git a/Shiny/include/ShinyData.h b/Shiny/include/ShinyData.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/include/ShinyMacros.h b/Shiny/include/ShinyMacros.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/include/ShinyManager.h b/Shiny/include/ShinyManager.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/include/ShinyNode.h b/Shiny/include/ShinyNode.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/include/ShinyNodePool.h b/Shiny/include/ShinyNodePool.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/include/ShinyNodeState.h b/Shiny/include/ShinyNodeState.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/include/ShinyOutput.h b/Shiny/include/ShinyOutput.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/include/ShinyPrereqs.h b/Shiny/include/ShinyPrereqs.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,55 @@ THE SOFTWARE.
 #define SHINY_PREREQS_H
 
 #include "ShinyConfig.h"
+#include "ShinyVersion.h"
+
+
+/*---------------------------------------------------------------------------*/
+
+#define SHINY_PLATFORM_WIN32 0x1
+#define SHINY_PLATFORM_POSIX 0x2
+
+#if defined (_WIN32)
+# define SHINY_PLATFORM SHINY_PLATFORM_WIN32
+
+#else /* ASSUME: POSIX-compliant OS */
+# define SHINY_PLATFORM SHINY_PLATFORM_POSIX
+#endif
+
+
+/*---------------------------------------------------------------------------*/
+
+#define SHINY_COMPILER_MSVC 0x1
+#define SHINY_COMPILER_GNUC 0x2
+#define SHINY_COMPILER_OTHER 0x3
+
+#if defined (_MSC_VER)
+# define SHINY_COMPILER SHINY_COMPILER_MSVC
+
+#elif defined (__GNUG__)
+# define SHINY_COMPILER SHINY_COMPILER_GNUC
+
+#else
+# define SHINY_COMPILER SHINY_COMPILER_OTHER
+#endif
+
+
+/*---------------------------------------------------------------------------*/
+
+#ifndef FALSE
+#define FALSE 0x0
+#endif
+
+#ifndef TRUE
+#define TRUE 0x1
+#endif
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+
+/*---------------------------------------------------------------------------*/
 
 #if SHINY_COMPILER == SHINY_COMPILER_GNUC
 #include <sys/types.h>

diff --git a/Shiny/include/ShinyTools.h b/Shiny/include/ShinyTools.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/include/ShinyVersion.h b/Shiny/include/ShinyVersion.h
@@ -0,0 +1,37 @@
+/*
+The MIT License
+
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#ifndef SHINY_VERSION_H
+#define SHINY_VERSION_H
+
+
+/*---------------------------------------------------------------------------*/
+
+#define SHINY_VERSION "2.6 RC1"
+#define SHINY_SHORTNAME "Shiny"
+#define SHINY_FULLNAME "Shiny Profiler"
+#define SHINY_COPYRIGHT "Copyright (C) 2007-2010 Aidin Abedi"
+#define SHINY_DESCRIPTION "Shiny is a state of the art profiler designed to help finding bottlenecks in your project."
+
+#endif /* end of include guard */
diff --git a/Shiny/include/ShinyZone.h b/Shiny/include/ShinyZone.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/scripts/Shiny.vcproj b/Shiny/scripts/Shiny.vcproj
@@ -229,6 +229,10 @@
  RelativePath="..\include\ShinyTools.h"
  >
  </File>
+ <File
+ RelativePath="..\include\ShinyVersion.h"
+ >
+ </File>
  <File
  RelativePath="..\include\ShinyZone.h"
  >

diff --git a/Shiny/src/ShinyManager.c b/Shiny/src/ShinyManager.c
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/src/ShinyNode.c b/Shiny/src/ShinyNode.c
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/src/ShinyNodePool.c b/Shiny/src/ShinyNodePool.c
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/src/ShinyNodeState.c b/Shiny/src/ShinyNodeState.c
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/src/ShinyOutput.c b/Shiny/src/ShinyOutput.c
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/src/ShinyTools.c b/Shiny/src/ShinyTools.c
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Shiny/src/ShinyZone.c b/Shiny/src/ShinyZone.c
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/ShinyLua/include/ShinyLua.h b/ShinyLua/include/ShinyLua.h
@@ -1,7 +1,7 @@
 /*
 The MIT License
 
-Copyright (c) 2007-2009 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
+Copyright (c) 2007-2010 Aidin Abedi http:https://code.google.com/p/shinyprofiler/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal