Author: ajborley
Date: Thu Oct 12 04:29:57 2006
New Revision: 463206
URL: http://svn.apache.org/viewvc?view=rev&rev=463206
Log:
Various build updates for windows and Linux: include xsd dirs for Linux
extensions, use the single copy of sample headers, don't use osoa::sca header
in Python extension, don't produce debug stuff for ws_dispatcher release builds
on vc7
Modified:
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj
incubator/tuscany/cpp/sca/runtime/extensions/cpp/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/php/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/python/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat
incubator/tuscany/cpp/sca/runtime/extensions/ruby/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/sca/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/ws/Makefile.am
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/Makefile.am
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/Makefile.am
Modified:
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj?view=diff&rev=463206&r1=463205&r2=463206
==============================================================================
---
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj
(original)
+++
incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj
Thu Oct 12 04:29:57 2006
@@ -85,7 +85,7 @@
OutputFile="$(OutDir)/tuscany_sca_ws_dispatcher.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(TUSCANY_SCACPP)/lib,$(AXIS2C_HOME)/lib"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/Makefile.am?view=diff&rev=463206&r1=463205&r2=463206
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/Makefile.am Thu Oct 12
04:29:57 2006
@@ -2,4 +2,6 @@
datadir=$(prefix)/extensions/cpp
-nobase_data_DATA = xsd/*.xsd
\ No newline at end of file
+nobase_data_DATA = xsd/*.xsd
+
+EXTRA_DIST = xsd
\ No newline at end of file
Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/Makefile.am?view=diff&rev=463206&r1=463205&r2=463206
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/Makefile.am Thu Oct 12
04:29:57 2006
@@ -2,4 +2,6 @@
datadir=$(prefix)/extensions/php
-nobase_data_DATA = xsd/*.xsd
\ No newline at end of file
+nobase_data_DATA = xsd/*.xsd
+
+EXTRA_DIST = xsd
\ No newline at end of file
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/Makefile.am?view=diff&rev=463206&r1=463205&r2=463206
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/Makefile.am Thu Oct 12
04:29:57 2006
@@ -2,4 +2,6 @@
datadir=$(prefix)/extensions/python
-nobase_data_DATA = xsd/*.xsd
\ No newline at end of file
+nobase_data_DATA = xsd/*.xsd
+
+EXTRA_DIST = xsd
\ No newline at end of file
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat?view=diff&rev=463206&r1=463205&r2=463206
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat Thu Oct 12
04:29:57 2006
@@ -44,8 +44,6 @@
if not exist %pythonextdir%\bin mkdir %pythonextdir%\bin
if not exist %pythonextdir%\lib mkdir %pythonextdir%\lib
if not exist %pythonextdir%\include mkdir %pythonextdir%\include
-if not exist %pythonextdir%\include\osoa mkdir %pythonextdir%\include\osoa
-if not exist %pythonextdir%\include\osoa\sca mkdir
%pythonextdir%\include\osoa\sca
if not exist %pythonextdir%\include\tuscany mkdir
%pythonextdir%\include\tuscany
if not exist %pythonextdir%\include\tuscany\sca mkdir
%pythonextdir%\include\tuscany\sca
if not exist %pythonextdir%\include\tuscany\sca\python mkdir
%pythonextdir%\include\tuscany\sca\python
@@ -55,7 +53,6 @@
del %pythonextdir%\bin\tuscany_sca_python.*
del %pythonextdir%\lib\*.lib
-copy %srcdir%\osoa\sca\*.h %pythonextdir%\include\osoa\sca
copy %srcdir%\tuscany\sca\python\*.h %pythonextdir%\include\tuscany\sca\python
copy %srcdir%\tuscany\sca\python\model\*.h
%pythonextdir%\include\tuscany\sca\python\model
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/Makefile.am?view=diff&rev=463206&r1=463205&r2=463206
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/Makefile.am Thu Oct 12
04:29:57 2006
@@ -2,4 +2,6 @@
datadir=$(prefix)/extensions/ruby
-nobase_data_DATA = xsd/*.xsd
\ No newline at end of file
+nobase_data_DATA = xsd/*.xsd
+
+EXTRA_DIST = xsd
\ No newline at end of file
Modified: incubator/tuscany/cpp/sca/runtime/extensions/sca/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/sca/Makefile.am?view=diff&rev=463206&r1=463205&r2=463206
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/sca/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/sca/Makefile.am Thu Oct 12
04:29:57 2006
@@ -2,3 +2,5 @@
datadir=$(prefix)/extensions/sca
nobase_data_DATA = xsd/*.xsd
+
+EXTRA_DIST = xsd
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/Makefile.am?view=diff&rev=463206&r1=463205&r2=463206
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/Makefile.am Thu Oct 12
04:29:57 2006
@@ -2,3 +2,5 @@
datadir=$(prefix)/extensions/ws
nobase_data_DATA = xsd/*.xsd
+
+EXTRA_DIST = xsd
Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/Makefile.am?view=diff&rev=463206&r1=463205&r2=463206
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/Makefile.am
(original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/Makefile.am Thu
Oct 12 04:29:57 2006
@@ -28,4 +28,5 @@
INCLUDES = -I$(TUSCANY_SCACPP)/extensions/cpp/include \
-I${TUSCANY_SCACPP}/include \
- -I${TUSCANY_SDOCPP}/include
+ -I${TUSCANY_SDOCPP}/include \
+ -I../bigbank.account
Modified:
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/Makefile.am?view=diff&rev=463206&r1=463205&r2=463206
==============================================================================
---
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/Makefile.am
(original)
+++
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/Makefile.am
Thu Oct 12 04:29:57 2006
@@ -34,4 +34,5 @@
INCLUDES = \
-I$(TUSCANY_SCACPP)/extensions/cpp/include \
-I${TUSCANY_SCACPP}/include \
--I${TUSCANY_SDOCPP}/include
+-I${TUSCANY_SDOCPP}/include \
+-I../sample.calculator
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
