Changed the license to LGPL to be able to use the msgpack implementat…

…ion in GET nv
gfannes · Feb 21, 2013 · 4d291ef · 4d291ef
1 parent 8589442
commit 4d291ef
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 71 deletions.
diff --git a/cpp/apps/da/CompileExe.cpp b/cpp/apps/da/CompileExe.cpp
@@ -1,7 +1,6 @@
 //#define GUBG_LOG
 #include "da/CompileExe.hpp"
 #include "da/build/Builder.hpp"
-#include "da/build/Configuration.hpp"
 #include "da/compile/Compiler.hpp"
 #include "da/link/Linker.hpp"
 #include "da/FileCache.hpp"

diff --git a/cpp/apps/da/build/Builder.cpp b/cpp/apps/da/build/Builder.cpp
@@ -1,11 +1,36 @@
 //#define GUBG_LOG
 #include "da/build/Builder.hpp"
+#include "gubg/file/Filesystem.hpp"
+#include "gubg/env/Util.hpp"
+#include "gubg/string_algo.hpp"
 #include <queue>
 using namespace da;
+using namespace da::package;
+using namespace gubg;
+using namespace gubg::file;
 using gubg::file::File;
 using namespace std;
 
-ReturnCode Builder::process(const SourceFile &source)
+Builder::Builder()
+{
+    packages_ << Local::create(File(getcwd()));
+
+    {
+        string str;
+        if (env::expand(str, "$GUBG"))
+            packages_ << GUBG::create(File(str));
+        if (env::expand(str, "$GUBG_BOOST"))
+            packages_ << Boost::create(File(str));
+    }
+
+    packages_ << SDL::create(File(""));
+
+    packages_.prune();
+
+    L("I found following packages: " << string_algo::join(packages_.names(), ", "));
+}
+
+da::ReturnCode Builder::process(const SourceFile &source)
 {
     MSS_BEGIN(ReturnCode, process);
 
@@ -24,9 +49,9 @@ ReturnCode Builder::process(const SourceFile &source)
 
         Headers headers;
         SourceFiles sisterFiles;
-        MSS(src->searchForHeaders(headers, sisterFiles, configuration_.packages()));
+        MSS(src->searchForHeaders(headers, sisterFiles, packages_));
         headersPerSource_[src] = headers;
-        configuration_.packages().extractCompileSettings(compileSettings_);
+        packages_.extractCompileSettings(compileSettings_);
 
         for (auto hdr: headers)
         {

diff --git a/cpp/apps/da/build/Builder.hpp b/cpp/apps/da/build/Builder.hpp
@@ -3,27 +3,29 @@
 
 #include "da/Codes.hpp"
 #include "da/Types.hpp"
-#include "da/build/Configuration.hpp"
 #include "da/build/Sources.hpp"
 #include "da/build/Headers.hpp"
+#include "da/package/Packages.hpp"
 
 namespace da
 {
     class Builder
     {
         public:
+            Builder();
+
             typedef gubg::file::File SourceFile;
             ReturnCode process(const SourceFile &);
 
-            void extractCompileSettings(CompileSettings &cs) const {configuration_.packages().extractCompileSettings(cs);}
-            void extractLinkSettings(LinkSettings &ls) const {configuration_.packages().extractLinkSettings(ls);}
+            void extractCompileSettings(CompileSettings &cs) const {packages_.extractCompileSettings(cs);}
+            void extractLinkSettings(LinkSettings &ls) const {packages_.extractLinkSettings(ls);}
 
             const Sources &sources() const {return sources_;}
             Headers headers(Source::Ptr) const;
             const IncludePaths &includePaths() const {return compileSettings_.includePaths;}
 
         private:
-            Configuration configuration_;
+            da::package::Packages packages_;
             Sources sources_;
             Headers headers_;
             typedef std::map<Source::Ptr, Headers> HeadersPerSource;

diff --git a/cpp/apps/da/build/Configuration.cpp b/cpp/apps/da/build/Configuration.cpp
diff --git a/cpp/apps/da/build/Configuration.hpp b/cpp/apps/da/build/Configuration.hpp
diff --git a/cpp/apps/da/package/GUBG.cpp b/cpp/apps/da/package/GUBG.cpp
@@ -73,6 +73,7 @@ da::ReturnCode GUBG::resolveHeader(File &resolvedHeader, SourceFiles &sisterFile
             linkSettings_.libraries.insert("iup");
             linkSettings_.libraries.insert("iup_pplot");
             linkSettings_.libraries.insert("iupcontrols");
+            linkSettings_.libraries.insert("iupcd");
             linkSettings_.libraries.insert("cd");
         }
         else if (bn == "garf")

diff --git a/cpp/apps/da/package/Package.hpp b/cpp/apps/da/package/Package.hpp
@@ -3,6 +3,7 @@
 
 #include "da/Types.hpp"
 #include "da/Codes.hpp"
+#include "da/Context.hpp"
 #include "gubg/file/File.hpp"
 #include <string>
 #include <memory>
@@ -12,7 +13,7 @@ namespace da
 {
     namespace package
     {
-        class Package
+        class Package: public gubg::Context<Context>
         {
             public:
                 typedef std::shared_ptr<Package> Ptr;

diff --git a/cpp/libs/gubg/testing/TestMgr.cpp b/cpp/libs/gubg/testing/TestMgr.cpp
@@ -47,10 +47,8 @@ TestTag::TestTag(const string &tag):
     tag_(tag),
     root_(nullptr)
 {
-    L("ctor " << tag_);
     if (nullptr == rootTag.get())
     {
-        L("We are the root tag");
         rootTag.reset(this);
         root_ = new ThreadStats;
     }
@@ -62,11 +60,9 @@ TestTag::TestTag(const string &tag):
 }
 TestTag::~TestTag()
 {
-    L("dtor " << tag_);
     root_->popTag();
     if (this == rootTag.get())
     {
-        L("We were the root tag");
         TestMaster::instance().report(*(const ThreadStats *)root_);
         delete root_;
         rootTag.reset(nullptr);

diff --git a/cpp/libs/iup/iup.hpp b/cpp/libs/iup/iup.hpp
@@ -1,10 +1,23 @@
-#ifndef iup_iup_hpp
-#define iup_iup_hpp
+#ifndef HEADER_iup_iup_hpp_ALREADY_INCLUDED
+#define HEADER_iup_iup_hpp_ALREADY_INCLUDED
 
 #include "iup.h"
 
 namespace iup
 {
+
+    class IUP
+    {
+        public:
+            IUP(int &argc, char **&argv)
+            {
+                IupOpen(&argc, &argv);
+            }
+            ~IUP()
+            {
+                IupClose();
+            }
+    };
 }
 
 #endif
diff --git a/license.asciidoc b/license.asciidoc
@@ -1,6 +1,8 @@
 == License
 
-This software is developed by Geert Fannes and is released under the GPL. I'd appreciate it if you let me know you find it useful: geert_dot_fannes_at_gmail_dot_com
+This software is developed by Geert Fannes and is released under the LGPL. This basically means you are allowed to use it for any purpose, even in combination with proprietary software. The main obligation for the user is to give back any changes you make to the gubg software itself.
+
+Apart from this, I'd appreciate it if you let me know whether you find it useful: geert_dot_fannes_at_gmail_dot_com
 
 No waranty is granted whatsoever.
 

diff --git a/make/da.makefile b/make/da.makefile
@@ -7,7 +7,7 @@ da-help:
 DA_CPP_FILES := \
 	da \
 	FixIncludeGuards CompileExe FileCache Arduino \
-	build/Configuration build/Builder build/Header build/Headers build/Source build/Sources \
+	build/Builder build/Header build/Headers build/Source build/Sources \
 	package/Packages package/Local package/Boost package/GUBG package/SDL \
 	compile/Compiler \
 	link/Linker \