Lines 77-111
Link Here
|
77 |
.INCLUDE : product.mk |
77 |
.INCLUDE : product.mk |
78 |
.ENDIF # "$(PRODUCTNAME)"!="" |
78 |
.ENDIF # "$(PRODUCTNAME)"!="" |
79 |
|
79 |
|
80 |
# --- set SOLARVERSION for older workspaces |
|
|
81 |
|
82 |
.IF "$(SOLARVERSION)"=="" |
83 |
SOLARVERSION=$(SOLARVER)$/$(UPD) |
84 |
.ENDIF |
85 |
|
86 |
.INCLUDE : minor.mk |
80 |
.INCLUDE : minor.mk |
87 |
|
81 |
|
88 |
.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" |
82 |
.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" |
|
|
83 |
|
84 |
.IF "$(SOURCEVERSION)"!="$(WORK_STAMP)" |
85 |
.ERROR : ; @echo Forced error: minor.mk in solenv/inc does not match your version! |
86 |
WRONG_SOURCEVERSION |
87 |
.ENDIF |
88 |
|
89 |
# Create $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk if needed |
89 |
%minor.mk : |
90 |
%minor.mk : |
90 |
.IF "$(SOURCEVERSION)"=="$(WORK_STAMP)" |
|
|
91 |
@+-$(MKDIRHIER) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) >& $(NULLDEV) |
91 |
@+-$(MKDIRHIER) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) >& $(NULLDEV) |
92 |
.ELSE # "$(SOURCEVERSION)"=="$(WORK_STAMP)" |
|
|
93 |
@+echo "#" |
94 |
@+echo "#" |
95 |
@+echo "# ERROR: minor.mk in solenv/inc does not match your version!" |
96 |
@+echo "#" |
97 |
@+echo "#" |
98 |
force_dmake_to_error |
99 |
.ENDIF # "$(SOURCEVERSION)"=="$(WORK_STAMP)" |
100 |
.IF "$(GUI)"=="UNX" |
101 |
@+tr -d "\015" < $(SOLARENV)$/inc$/minor.mk > $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk |
102 |
@+$(TOUCH) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg >& $(NULLDEV) |
103 |
.ELSE # "$(GUI)"=="UNX" |
104 |
@+$(COPY) $(SOLARENV)$/inc$/minor.mk $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk >& $(NULLDEV) |
92 |
@+$(COPY) $(SOLARENV)$/inc$/minor.mk $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk >& $(NULLDEV) |
105 |
@+$(TOUCH) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg >& $(NULLDEV) |
93 |
@+$(TOUCH) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg >& $(NULLDEV) |
106 |
.ENDIF # "$(GUI)"=="UNX" |
|
|
107 |
.ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" |
94 |
.ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" |
108 |
|
95 |
|
|
|
96 |
# Force creation of $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/ |
97 |
# $(UPD)minor.mk could be empty as it's contents were already included from minor.mk |
98 |
.INCLUDE : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk |
99 |
|
109 |
.IF "$(BSCLIENT)"=="TRUE" |
100 |
.IF "$(BSCLIENT)"=="TRUE" |
110 |
.IF "$(UPDATER)"!="YES" |
101 |
.IF "$(UPDATER)"!="YES" |
111 |
incorrect_settings: |
102 |
incorrect_settings: |
Lines 116-127
Link Here
|
116 |
.ENDIF |
107 |
.ENDIF |
117 |
.ENDIF |
108 |
.ENDIF |
118 |
|
109 |
|
119 |
.INCLUDE : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk |
|
|
120 |
|
121 |
%udkversion.mk : $(PRJ)$/inc$/udkversion.mk |
110 |
%udkversion.mk : $(PRJ)$/inc$/udkversion.mk |
122 |
@+$(COPY) $(PRJ)$/inc$/udkversion.mk $@ |
111 |
@+$(COPY) $(PRJ)$/inc$/udkversion.mk $@ |
123 |
|
112 |
|
124 |
.INCLUDE .IGNORE : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/udkversion.mk |
113 |
.INCLUDE : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/udkversion.mk |
125 |
|
114 |
|
126 |
# --- reset defined Environments -------------------- |
115 |
# --- reset defined Environments -------------------- |
127 |
.SUFFIXES: |
116 |
.SUFFIXES: |