diff options
| -rw-r--r-- | scp2/source/layout/layout.scp | 19 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/worker.pm | 2 | ||||
| -rw-r--r-- | solenv/inc/layout.mk | 32 | ||||
| -rw-r--r-- | solenv/inc/rules.mk | 8 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 12 |
5 files changed, 66 insertions, 7 deletions
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp index 124be9c91616..64629d480a20 100644 --- a/scp2/source/layout/layout.scp +++ b/scp2/source/layout/layout.scp @@ -35,11 +35,18 @@ Directory gid_Dir_Share_Layout DosName = "layout"; End -File gid_File_Zip_Sw_Layout +File gid_File_Zip_Toolkit_Layout Dir = gid_Dir_Share_Layout; USER_FILE_BODY; Styles = (ARCHIVE, PATCH); - Name = "sw-layout.zip"; + Name = "toolkit-layout.zip"; +End + +File gid_File_Zip_Sc_Layout + Dir = gid_Dir_Share_Layout; + USER_FILE_BODY; + Styles = (ARCHIVE, PATCH); + Name = "sc-layout.zip"; End File gid_File_Zip_Svx_Layout @@ -48,3 +55,11 @@ File gid_File_Zip_Svx_Layout Styles = (ARCHIVE, PATCH); Name = "svx-layout.zip"; End + +File gid_File_Zip_Sw_Layout + Dir = gid_Dir_Share_Layout; + USER_FILE_BODY; + Styles = (ARCHIVE, PATCH); + Name = "sw-layout.zip"; +End + diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index cf410c32c7a3..1988302a1a78 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -797,7 +797,7 @@ sub install_simple ($$$$$$) push @lines, "$destination\n"; # printf "cp $sourcepath $destdir$destination\n"; - copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $!"; + copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!"; my $sourcestat = stat($sourcepath); utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination"); chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!"; diff --git a/solenv/inc/layout.mk b/solenv/inc/layout.mk new file mode 100644 index 000000000000..97bdc9e72c2c --- /dev/null +++ b/solenv/inc/layout.mk @@ -0,0 +1,32 @@ +TRALAY=$(AUGMENT_LIBRARY_PATH) tralay +XML_DEST=$(DLLDEST) +XML_LANGS=$(alllangiso) + +ALL_XMLS=$(foreach,i,$(XML_FILES) "$(XML_DEST)/$i") $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) "$(XML_DEST)/$i/$j")) + +# Must remove the -j (no duplicate base file names) flag +ZIPUPDATE=-u +XML_ZIP = $(PRJNAME)-layout + +ALLTAR: localize.sdf $(XML_ZIP) + +$(XML_ZIP): $(ALL_XMLS) + +ZIP1DIR=$(XML_DEST) +ZIP1TARGET=$(XML_ZIP) +ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@) + +$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml + -$(MKDIR) $(@:d) + @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml + $(TRALAY) -m localize.sdf -o "$(XML_DEST)" -l $(XML_LANGS:f:t" -l ") "$<" + +$(XML_DEST)/%.xml: %.xml + -$(MKDIR) $(@:d) + $(COPY) "$<" "$@" + +# Don't want to overwrite filled localize.sdf with empty template +template.sdf: + $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US "$i") > $@ + +$(ZIP1LIST): localize.sdf diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 02f0ffdcf9a0..fbddd365c866 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -33,7 +33,7 @@ MKFILENAME:=RULES.MK $(OBJ)$/%.obj : %.cxx @echo ------------------------------ - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx @@ -58,7 +58,7 @@ $(OBJ)$/%.obj : %.cxx $(OBJ)$/%.obj : %.cpp @echo ------------------------------ - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp @@ -81,7 +81,7 @@ $(OBJ)$/%.obj : %.cpp $(OBJ)$/%.obj : %.cc @echo ------------------------------ - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cc @@ -163,7 +163,7 @@ $(SLO)$/precompiled_ex.% .PHONY: $(SLO)$/%.obj : %.cxx @echo ------------------------------ - @echo Making: $@ + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) # just a helper var @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS))) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 2af4ae71e47f..fdf45497058a 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1129,6 +1129,18 @@ GLOBAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_OFF LOCAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS) LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON +.IF "$(ENABLE_LAYOUT)" == "TRUE" +CDEFS+=-DENABLE_LAYOUT=1 +.ELSE # ENABLE_LAYOUT != TRUE +CFLAGS+=-DENABLE_LAYOUT=0 +.ENDIF # ENABLE_LAYOUT != TRUE + +.IF "$(ENABLE_LAYOUT_EXPERIMENTAL)" == "TRUE" +CDEFS+=-DENABLE_LAYOUT_EXPERIMENTAL=1 +.ELSE # ENABLE_LAYOUT_EXPERIMENTAL != TRUE +CFLAGS+=-DENABLE_LAYOUT_EXPERIMENTAL=0 +.ENDIF # ENABLE_LAYOUT_EXPERIMENTAL != TRUE + # compose flags and defines for GUI .IF "$(TARGETTYPE)"=="GUI" CDEFS+= $(CDEFSGUI) |