You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by bu...@apache.org on 2015/06/19 23:59:51 UTC

svn commit: r955416 - in /websites/staging/celix/trunk/content: ./ background-links.html documentation/getting_started.html documentation/memorypools.html examples/helloworld-links.html

Author: buildbot
Date: Fri Jun 19 21:59:50 2015
New Revision: 955416

Log:
Staging update by buildbot for celix

Modified:
    websites/staging/celix/trunk/content/   (props changed)
    websites/staging/celix/trunk/content/background-links.html
    websites/staging/celix/trunk/content/documentation/getting_started.html
    websites/staging/celix/trunk/content/documentation/memorypools.html
    websites/staging/celix/trunk/content/examples/helloworld-links.html

Propchange: websites/staging/celix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jun 19 21:59:50 2015
@@ -1 +1 @@
-1686502
+1686505

Modified: websites/staging/celix/trunk/content/background-links.html
==============================================================================
--- websites/staging/celix/trunk/content/background-links.html (original)
+++ websites/staging/celix/trunk/content/background-links.html Fri Jun 19 21:59:50 2015
@@ -140,7 +140,7 @@
 </li>
 <li><a href="http://www.osgi.org/Main/HomePage">OSGi</a><ul>
 <li><a href="http://www.osgi.org/Specifications/HomePage">OSGi Specification</a></li>
-<li><a href="http://felix.apache.org/site/index.html">Apache Felix</a></li>
+<li><a href="http://felix.apache.org/index.html">Apache Felix</a></li>
 </ul>
 </li>
 <li><a href="http://www.apache.org/">Apache Foundation</a><ul>

Modified: websites/staging/celix/trunk/content/documentation/getting_started.html
==============================================================================
--- websites/staging/celix/trunk/content/documentation/getting_started.html (original)
+++ websites/staging/celix/trunk/content/documentation/getting_started.html Fri Jun 19 21:59:50 2015
@@ -140,7 +140,7 @@
 <ul>
 <li>Development Environment<ul>
 <li>build-essentials </li>
-<li>subversion</li>
+<li>git</li>
 <li>cmake</li>
 </ul>
 </li>
@@ -159,8 +159,9 @@ apt-get install -yq --no-install-recomme
     curl \
     libapr1-dev \
     libaprutil1-dev \
-    subversion \
+    git \
     libjansson-dev \
+    libxml2-dev \
     libcurl4-openssl-dev \
     cmake 
 </pre></p>
@@ -173,7 +174,7 @@ apt-get install -yq --no-install-recomme
 <span class="n">cd</span> $<span class="p">{</span><span class="n">WS</span><span class="p">}</span>
 
 <span class="c">#checkout Apache Celix</span>
-<span class="n">svn</span> <span class="n">co</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">celix</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span> <span class="n">celix</span><span class="o">-</span><span class="n">src</span>
+<span class="n">git</span> <span class="n">clone</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">github</span><span class="p">.</span><span class="n">com</span><span class="o">/</span><span class="n">apache</span><span class="o">/</span><span class="n">celix</span><span class="p">.</span><span class="n">git</span> <span class="n">celix</span><span class="o">-</span><span class="n">src</span>
 
 <span class="c">#create a build directory to build Celix in (out of source build)</span>
 <span class="nb">mkdir</span> <span class="n">celix</span><span class="o">-</span><span class="n">build</span>
@@ -182,8 +183,9 @@ apt-get install -yq --no-install-recomme
 <span class="c">#Note1  if you want to change the install path add -DCMAKE_INSTALL_PREFIX=/opt/local</span>
 <span class="c">#Note2  If you want to be able to edit all the available options, </span>
 <span class="c">#       use the ccmake command instead of cmake, this will will present a ncursus based ui</span>
+<span class="c">#Note3  This will also include some examples. They can be found lateron at the deploy subfolder</span>
 <span class="n">cd</span> <span class="n">celix</span><span class="o">-</span><span class="n">build</span>
-<span class="n">cmake</span> <span class="p">.</span><span class="o">./</span><span class="n">celix</span><span class="o">-</span><span class="n">src</span> <span class="o">-</span><span class="n">DBUILD_SHELL</span><span class="p">=</span><span class="n">TRUE</span> <span class="o">-</span><span class="n">DBUILD_SHELL_TUI</span><span class="p">=</span><span class="n">TRUE</span>
+<span class="n">cmake</span> <span class="p">.</span><span class="o">./</span><span class="n">celix</span><span class="o">-</span><span class="n">src</span> <span class="o">-</span><span class="n">DBUILD_SHELL</span><span class="p">=</span><span class="n">TRUE</span> <span class="o">-</span><span class="n">DBUILD_SHELL_TUI</span><span class="p">=</span><span class="n">TRUE</span> <span class="o">-</span><span class="n">DBUILD_EXAMPLES</span><span class="p">=</span><span class="n">TRUE</span>
 <span class="n">make</span> <span class="nb">all</span>
 
 <span class="c">#install the framework and the bundles</span>

Modified: websites/staging/celix/trunk/content/documentation/memorypools.html
==============================================================================
--- websites/staging/celix/trunk/content/documentation/memorypools.html (original)
+++ websites/staging/celix/trunk/content/documentation/memorypools.html Fri Jun 19 21:59:50 2015
@@ -157,7 +157,7 @@ To be sure all user pools are cleared, t
 </li>
 </ul>
 <p>The following diagram roughly depicts the state of a bundle and what pool must be/is used for that state.</p>
-<p><img alt="alt text" src="/celix/images/memory_pools.png" /></p>
+<p><img alt="alt text" src="/images/memory_pools.png" /></p>
                     </div>
                     <div id="homeright">
                         

Modified: websites/staging/celix/trunk/content/examples/helloworld-links.html
==============================================================================
--- websites/staging/celix/trunk/content/examples/helloworld-links.html (original)
+++ websites/staging/celix/trunk/content/examples/helloworld-links.html Fri Jun 19 21:59:50 2015
@@ -133,9 +133,9 @@
                         <h1 class="title"></h1>
                         <h2 id="useful-links">Useful Links</h2>
 <ul>
-<li><a href="https://svn.apache.org/repos/asf/incubator/celix/trunk/hello_world">Example Source</a></li>
+<li><a href="https://github.com/apache/celix/tree/master/examples/hello_world">Example Source</a></li>
 <li>
-<p><a href="/celix/buildingandrunning.html">Building and Running Celix</a></p>
+<p><a href="/buildingandrunning.html">Building and Running Celix</a></p>
 </li>
 <li>
 <p><a href="http://www.cmake.org/cmake/help/documentation.html">CMake Documentation</a></p>