Author: orw Date: Thu Dec 13 13:02:45 2012 New Revision: 1421274 URL: http://svn.apache.org/viewvc?rev=1421274&view=rev Log: #121466# - remove BUILD_SPECIAL and derived NETWORK_BUILD variable to workaround certain file locking failure
Modified: openoffice/trunk/main/solenv/inc/rules.mk openoffice/trunk/main/solenv/inc/settings.mk Modified: openoffice/trunk/main/solenv/inc/rules.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/rules.mk?rev=1421274&r1=1421273&r2=1421274&view=diff ============================================================================== --- openoffice/trunk/main/solenv/inc/rules.mk (original) +++ openoffice/trunk/main/solenv/inc/rules.mk Thu Dec 13 13:02:45 2012 @@ -89,30 +89,12 @@ $(OBJ)/%.obj : %.cc .IF "$(ENABLE_PCH)"!="" # workaround for file locking problems on network volumes -.IF "$(NETWORK_BUILD)"=="" PCHOUTDIR=$(SLO)/pch PCHEXOUTDIR=$(SLO)/pch_ex -.ELSE # "$(NETWORK_BUILD)"=="" -PCHOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)$(PROEXT) -PCHEXOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)_ex$(PROEXT) -.ENDIF # "$(NETWORK_BUILD)"=="" $(SLO)/precompiled.% .PHONY: -$(MKDIRHIER) $(SLO)/pch .IF "$(COM)"=="MSC" -.IF "$(NETWORK_BUILD)"!="" - -$(MKDIRHIER) $(PCHOUTDIR) -.IF "$(HAVE_BIG_TMP)"=="" - $(COMMAND_ECHO)-$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) -.ENDIF # "$(HAVE_BIG_TMP)"=="" -.ENDIF # "$(NETWORK_BUILD)"!="" $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx) -.IF "$(NETWORK_BUILD)"!="" - $(COMMAND_ECHO)$(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -.IF "$(HAVE_BIG_TMP)"=="" - $(COMMAND_ECHO)$(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) - $(COMMAND_ECHO)$(RMDIR) $(PCHOUTDIR) -.ENDIF # "$(HAVE_BIG_TMP)"=="" -.ENDIF # "$(NETWORK_BUILD)"!="" .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000" $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx @@ -124,20 +106,7 @@ $(SLO)/precompiled.% .PHONY: $(SLO)/precompiled_ex.% .PHONY: -$(MKDIRHIER) $(SLO)/pch_ex .IF "$(COM)"=="MSC" -.IF "$(NETWORK_BUILD)"!="" - -$(MKDIRHIER) $(PCHEXOUTDIR) -.IF "$(HAVE_BIG_TMP)"=="" - $(COMMAND_ECHO)-$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) -.ENDIF # "$(HAVE_BIG_TMP)"=="" -.ENDIF # "$(NETWORK_BUILD)"!="" $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx) -.IF "$(NETWORK_BUILD)"!="" - $(COMMAND_ECHO)$(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -.IF "$(HAVE_BIG_TMP)"=="" - $(COMMAND_ECHO)$(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) - $(COMMAND_ECHO)$(RMDIR) $(PCHEXOUTDIR) -.ENDIF # "$(HAVE_BIG_TMP)"=="" -.ENDIF # "$(NETWORK_BUILD)"!="" .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000" $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx Modified: openoffice/trunk/main/solenv/inc/settings.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/settings.mk?rev=1421274&r1=1421273&r2=1421274&view=diff ============================================================================== --- openoffice/trunk/main/solenv/inc/settings.mk (original) +++ openoffice/trunk/main/solenv/inc/settings.mk Thu Dec 13 13:02:45 2012 @@ -38,12 +38,6 @@ force_dmake_to_error ENABLE_PCH=TRUE .ENDIF # "$(USE_PCH)"!="" -.IF "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!="" -.IF "$(SOLARSRC)"=="$(SRC_ROOT)" -NETWORK_BUILD:=TRUE -.ENDIF # "$(SOLARSRC)"=="$(SRC_ROOT)" -.ENDIF # "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!="" - .INCLUDE : unitools.mk .INCLUDE : minor.mk