remove checks for unused BUILD_SPECIAL environment variable

3 files changed, 1 insertions, 49 deletions

diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index b322b9e14496..a820cd967e1b 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -668,13 +668,6 @@ sub set_default_productversion_if_required
     {
         $allvariables->{'PRODUCTVERSION'} = 1;  # FAKE
     }
-
-    # Creating differentiators for BUILD_SPECIAL in layering
-    if ( ! $ENV{'BUILD_SPECIAL'} )
-    {
-        if ( $allvariables->{'REGISTRYLAYERNAME'} ) { $allvariables->{'REGISTRYLAYERNAME'} = $allvariables->{'REGISTRYLAYERNAME'} . "_"; }
-        if (( $installer::globals::iswindowsbuild ) && ( $allvariables->{'BASISROOTNAME'} )) { $allvariables->{'BASISROOTNAME'} = $allvariables->{'BASISROOTNAME'} . "_"; }
-    }
 }
 
 ####################################################
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index ca816d8e664b..cc2d8dfa62c5 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -92,31 +92,13 @@ $(OBJ)/%.obj : %.cc
 .ENDIF
 
 .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)$(PRJNAME)$(PROEXT)
-PCHEXOUTDIR=$(TMP)/$(BUILD)$(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
@@ -128,20 +110,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
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 661861b9b8b7..6030f138a5a5 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -42,12 +42,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
@@ -973,10 +967,6 @@ RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)"
 RSCFLAGS=-s
 RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) $(JAVADEF)
 
-.IF "$(BUILD_SPECIAL)"!=""
-RSCDEFS+=-DBUILD_SPECIAL=$(BUILD_SPECIAL)
-.ENDIF
-
 RSCDEFIMG*=default_images
 
 RSCEXTINC=.