celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [20/50] [abbrv] celix git commit: CELIX-378: Moves install dir of cpputest and jansson to /usr/local instead of /usr
Date Wed, 26 Oct 2016 12:15:43 GMT
CELIX-378: Moves install dir of cpputest and jansson to /usr/local instead of /usr


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/58ff4ece
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/58ff4ece
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/58ff4ece

Branch: refs/heads/master
Commit: 58ff4ecea7f684dc938b46f37ab1308e414223dc
Parents: 525dc87
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Fri Oct 7 19:26:08 2016 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Fri Oct 7 19:26:08 2016 +0200

----------------------------------------------------------------------
 .travis.yml                                          |  6 +++---
 documents/getting_started/readme.md                  |  2 +-
 documents/getting_started/using_services_with_cxx.md | 13 ++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/58ff4ece/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 1e86283..5d955b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,11 +45,11 @@ before_install:
 before_script:
     - wget https://github.com/cpputest/cpputest.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true
-O /tmp/cpputest.tar.gz
     - tar -xzvf /tmp/cpputest.tar.gz -C /tmp
-    - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd /tmp/cpputest-3.7.1
&& ./configure --prefix=/usr && make && sudo make install &&
cd -
-    - cd /tmp/cpputest-3.7.1 && ./configure --prefix=/usr && make &&
sudo make install && cd -
+    - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd /tmp/cpputest-3.7.1
&& ./configure --prefix=/usr/local && make && sudo make install &&
cd -
+    - cd /tmp/cpputest-3.7.1 && ./configure --prefix=/usr/local && make &&
sudo make install && cd -
     - git clone https://github.com/akheron/jansson.git jansson-build
     - cd jansson-build && git checkout 2.7
-    - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr . && make
+    - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local . &&
make
     - sudo make install
     - cd -
     - mkdir build install

http://git-wip-us.apache.org/repos/asf/celix/blob/58ff4ece/documents/getting_started/readme.md
----------------------------------------------------------------------
diff --git a/documents/getting_started/readme.md b/documents/getting_started/readme.md
index 4ea875b..60da6d3 100644
--- a/documents/getting_started/readme.md
+++ b/documents/getting_started/readme.md
@@ -5,4 +5,4 @@ There are several guide to help you get started. The first guide is [Getting
Sta
 and this should get you started for your first C and/or C++ bundle.
 
 After that you can extend the example by providing and use services using the 
-guide [Getting Started: Using Services with C](using_services_for_c.md) or [Getting Started:
Using Services with C++](using_services_with_cxx.md). 
+guide [Getting Started: Using Services with C](using_services_with_c.md) or [Getting Started:
Using Services with C++](using_services_with_cxx.md). 

http://git-wip-us.apache.org/repos/asf/celix/blob/58ff4ece/documents/getting_started/using_services_with_cxx.md
----------------------------------------------------------------------
diff --git a/documents/getting_started/using_services_with_cxx.md b/documents/getting_started/using_services_with_cxx.md
index 8b7a5a4..307c088 100644
--- a/documents/getting_started/using_services_with_cxx.md
+++ b/documents/getting_started/using_services_with_cxx.md
@@ -12,21 +12,20 @@ TO start of, C++ service in Celix are just (abstract) classes.
 In the following example there also a projected default constructor to ensure no instantiation
of the service is possible:
 ```C++
 //IAnotherExample.h
-#ifndef ANOTHER_EXAMPLE_H
-#define ANOTHER_EXAMPLE_H
+#ifndef IANOTHER_EXAMPLE_H
+#define IANOTHER_EXAMPLE_H
 
-#define ANOTHER_EXAMPLE_VERSION "1.0.0"
-#define ANOTHER_EXAMPLE_VERSION "1.0.0"
-#define ANOTHER_EXAMPLE_CONSUMER_RANGE "[1.0.0,2.0.0)"
+#define IANOTHER_EXAMPLE_VERSION "1.0.0"
+#define IANOTHER_EXAMPLE_CONSUMER_RANGE "[1.0.0,2.0.0)"
 
 class IAnotherExample {
 protected:
     IAnotherExample() = default;
 public:
-    virtual void method() = 0;
+    virtual double method(int arg1, double arg2) = 0;
 };
 
-#endif //ANOTHER_EXAMPLE_H
+#endif //IANOTHER_EXAMPLE_H
 ```
 
 For a Celix service a service name, service provider version and service consumer range should
be declared.


Mime
View raw message