diff options
Diffstat (limited to 'sca-cpp/trunk/modules')
| -rwxr-xr-x | sca-cpp/trunk/modules/edit/mkapplinks | 11 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/edit/ssl-start | 4 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/edit/start | 4 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/http/httpd.hpp | 4 |
4 files changed, 16 insertions, 7 deletions
diff --git a/sca-cpp/trunk/modules/edit/mkapplinks b/sca-cpp/trunk/modules/edit/mkapplinks index 94f455ba48..a68a2896ec 100755 --- a/sca-cpp/trunk/modules/edit/mkapplinks +++ b/sca-cpp/trunk/modules/edit/mkapplinks @@ -17,16 +17,21 @@ # specific language governing permissions and limitations # under the License. -# Create app links and sub-directories if needed +aprefix=$1 +tprefix=$2 +nprefix=$3 + +# Create app links to Nuvem and Tuscany components +cd $1 for n in `ls apps | awk '{ printf "apps/%s/nuvem\n", $1 }'`; do if [ ! -e "$n" ]; then - ln -s ../../../../../nuvem/nuvem-parallel/nuvem "$n" + ln -s "$nprefix/nuvem-parallel/nuvem" "$n" fi done for n in `ls apps | awk '{ printf "apps/%s/lib\n", $1 }'`; do if [ ! -e "$n" ]; then - ln -s ../../../../components "$n" + ln -s "$tprefix/components" "$n" fi done diff --git a/sca-cpp/trunk/modules/edit/ssl-start b/sca-cpp/trunk/modules/edit/ssl-start index 015a5dda66..4a7e779bd6 100755 --- a/sca-cpp/trunk/modules/edit/ssl-start +++ b/sca-cpp/trunk/modules/edit/ssl-start @@ -141,8 +141,8 @@ Alias /home/home.b64 $here/htdocs/home/home.b64 EOF -# Create app links and sub-directories if needed -./mkapplinks +# Create app resource links +./mkapplinks . ../../../.. ../../../../../nuvem # Configure app resource aliases cat >>tmp/conf/svhost-ssl.conf <<EOF diff --git a/sca-cpp/trunk/modules/edit/start b/sca-cpp/trunk/modules/edit/start index c3ef1f7c4d..9a56cf755c 100755 --- a/sca-cpp/trunk/modules/edit/start +++ b/sca-cpp/trunk/modules/edit/start @@ -92,8 +92,8 @@ Alias /home/home.b64 $here/htdocs/home/home.b64 EOF -# Create app links and sub-directories if needed -./mkapplinks +# Create app resource links +./mkapplinks . ../../../.. ../../../../../nuvem # Configure app resource aliases cat >>tmp/conf/svhost.conf <<EOF diff --git a/sca-cpp/trunk/modules/http/httpd.hpp b/sca-cpp/trunk/modules/http/httpd.hpp index c1cc16d08d..5f8b867c9b 100644 --- a/sca-cpp/trunk/modules/http/httpd.hpp +++ b/sca-cpp/trunk/modules/http/httpd.hpp @@ -45,13 +45,17 @@ #include <http_request.h> // Ignore conversion warnings in HTTPD 2.3.15 header #ifdef WANT_MAINTAINER_MODE +#ifndef IS_DARWIN #pragma GCC diagnostic ignored "-Wconversion" #endif +#endif #include <http_protocol.h> // Re-enable conversion warnings #ifdef WANT_MAINTAINER_MODE +#ifndef IS_DARWIN #pragma GCC diagnostic warning "-Wconversion" #endif +#endif // Hack to workaround compile error with HTTPD 2.3.8 #define aplog_module_index aplog_module_index = 0 #include <http_log.h> |