diff options
| author | sb <sb@openoffice.org> | 2010-01-11 11:30:25 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-11 11:30:25 +0100 |
| commit | 9bba3843e87a987436b4e83d74c4979e5ddf3d19 (patch) | |
| tree | 33eaf8c4bd3f87eb8cc66b14308720f3c3c58df6 | |
| parent | 228f5b02965d746c331c0c89aff75105aa1f7a51 (diff) | |
sb118: introduced AUGMENT_LIBRARY_PATH_LOCAL, used by CPPUNITTESTER so that tests within a module pick up shared libs from that module in the local output tree
| -rw-r--r-- | solenv/inc/settings.mk | 9 | ||||
| -rw-r--r-- | solenv/inc/wnt.mk | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 8074c8dd0557..0974277ae68b 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1039,12 +1039,19 @@ LNTFLAGSOUTOBJ=-os .IF "$(USE_SHELL)" == "bash" AUGMENT_LIBRARY_PATH *= : && \ $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(SOLARLIBDIR) +AUGMENT_LIBRARY_PATH_LOCAL *= : && \ + $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(PWD)/$(LB):$(SOLARLIBDIR) .ELSE AUGMENT_LIBRARY_PATH *= if ($$?$(OOO_LIBRARY_PATH_VAR) == 1) \ eval 'setenv $(OOO_LIBRARY_PATH_VAR) \ "$${{$(OOO_LIBRARY_PATH_VAR)}}:$(SOLARLIBDIR)"' \ && if ($$?$(OOO_LIBRARY_PATH_VAR) == 0) \ setenv $(OOO_LIBRARY_PATH_VAR) "$(SOLARLIBDIR)" && +AUGMENT_LIBRARY_PATH_LOCAL *= if ($$?$(OOO_LIBRARY_PATH_VAR) == 1) \ + eval 'setenv $(OOO_LIBRARY_PATH_VAR) \ + "$${{$(OOO_LIBRARY_PATH_VAR)}}:$(PWD)/$(LB):$(SOLARLIBDIR)"' \ + && if ($$?$(OOO_LIBRARY_PATH_VAR) == 0) \ + setenv $(OOO_LIBRARY_PATH_VAR) "$(PWD)/$(LB):$(SOLARLIBDIR)" && .END .END @@ -1073,7 +1080,7 @@ JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker -CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppunittester +CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(SOLARBINDIR)/cppunittester HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index 0b5772833580..b170db530346 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -76,3 +76,5 @@ JAVA_RUNTIME=javai_g.lib OOO_LIBRARY_PATH_VAR = PATH AUGMENT_LIBRARY_PATH = : && \ $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(SOLARBINDIR:s/://:^"/cygdrive/") +AUGMENT_LIBRARY_PATH_LOCAL = : && \ + $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(PWD:s/://:^"/cygdrive/")/$(LB):$(SOLARBINDIR:s/://:^"/cygdrive/") |