From 8fa66f0b3e81f955072c87ae90124cc73b690465 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Sun, 5 Jun 2022 15:24:21 +1000 Subject: [PATCH] chore(windows): move scfontcombobox to developer --- common/windows/delphi/ext/Makefile | 6 +--- developer/src/Makefile | 30 ++++++++---------- developer/src/ext/Makefile | 6 +++- .../src/ext/scfontcombobox/Makefile | 2 +- .../scfontcombobox/TscFontcombobox_Readme.htm | 0 .../src/ext/scfontcombobox/scFontCombo.dpk | 0 .../src/ext/scfontcombobox/scFontCombo.dproj | 0 .../src/ext/scfontcombobox/scFontCombo.res | Bin .../src/ext/scfontcombobox/scFontComboBox.dcr | Bin .../src/ext/scfontcombobox/scFontComboBox.res | Bin .../src/ext/scfontcombobox/scFontCombobox.dfm | Bin .../src/ext/scfontcombobox/scFontCombobox.pas | 0 windows/src/ext/Makefile | 6 +--- 13 files changed, 22 insertions(+), 28 deletions(-) rename {windows => developer}/src/ext/scfontcombobox/Makefile (80%) rename {windows => developer}/src/ext/scfontcombobox/TscFontcombobox_Readme.htm (100%) rename {windows => developer}/src/ext/scfontcombobox/scFontCombo.dpk (100%) rename {windows => developer}/src/ext/scfontcombobox/scFontCombo.dproj (100%) rename {windows => developer}/src/ext/scfontcombobox/scFontCombo.res (100%) rename {windows => developer}/src/ext/scfontcombobox/scFontComboBox.dcr (100%) rename {windows => developer}/src/ext/scfontcombobox/scFontComboBox.res (100%) rename {windows => developer}/src/ext/scfontcombobox/scFontCombobox.dfm (100%) rename {windows => developer}/src/ext/scfontcombobox/scFontCombobox.pas (100%) diff --git a/common/windows/delphi/ext/Makefile b/common/windows/delphi/ext/Makefile index 58bffd95f0..722efc97a1 100644 --- a/common/windows/delphi/ext/Makefile +++ b/common/windows/delphi/ext/Makefile @@ -7,7 +7,7 @@ NOTARGET_SIGNCODE=yes !ifdef NODELPHI TARGETS=.virtual !else -TARGETS=dcpcrypt #jedi scfontcombobox cef4delphi +TARGETS=dcpcrypt #jedi cef4delphi !endif # jedi has no packages @@ -30,10 +30,6 @@ jedi: .virtual cd $(COMMON_ROOT)\ext\jedi $(MAKE) $(TARGET) -scfontcombobox: .virtual - cd $(COMMON_ROOT)\ext\scfontcombobox - $(MAKE) $(TARGET) - # # # diff --git a/developer/src/Makefile b/developer/src/Makefile index b8204ee83d..954bd74985 100644 --- a/developer/src/Makefile +++ b/developer/src/Makefile @@ -3,9 +3,9 @@ # !ifdef NODELPHI -TARGETS=kmcmpdll kmanalyze kmdecomp server kmlmc +TARGETS=build-tools kmcmpdll kmanalyze kmdecomp server kmlmc !else -TARGETS=kmcmpdll kmcomp kmanalyze kmconvert tike samples setup inst kmdecomp server kmlmc +TARGETS=build-tools kmcmpdll kmcomp kmanalyze kmconvert tike samples setup inst kmdecomp server kmlmc !endif EXCLUDEPATHDEFINES=1 @@ -16,47 +16,47 @@ CLEANS=clean-developer # ---------------------------------------------------------------------- -imsample: build-tools .virtual +imsample: .virtual cd $(DEVELOPER_ROOT)\src\imsample $(MAKE) $(TARGET) -kmcmpdll: build-tools .virtual +kmcmpdll: .virtual cd $(DEVELOPER_ROOT)\src\kmcmpdll $(MAKE) $(TARGET) -kmdecomp: build-tools .virtual +kmdecomp: .virtual cd $(DEVELOPER_ROOT)\src\kmdecomp $(MAKE) $(TARGET) -kmcomp: build-tools kmcmpdll +kmcomp: kmcmpdll cd $(DEVELOPER_ROOT)\src\kmcomp $(MAKE) $(TARGET) -kmanalyze: build-tools .virtual +kmanalyze: .virtual cd $(DEVELOPER_ROOT)\src\kmanalyze $(MAKE) $(TARGET) -kmconvert: build-tools .virtual +kmconvert: .virtual cd $(DEVELOPER_ROOT)\src\kmconvert $(MAKE) $(TARGET) -tike: build-tools kmcmpdll redist +tike: kmcmpdll redist cd $(DEVELOPER_ROOT)\src\tike $(MAKE) $(TARGET) -samples: build-tools .virtual +samples: .virtual cd $(DEVELOPER_ROOT)\src\samples $(MAKE) $(TARGET) -setup: build-tools .virtual +setup: .virtual cd $(DEVELOPER_ROOT)\src\setup $(MAKE) $(TARGET) -server: build-tools .virtual +server: .virtual cd $(DEVELOPER_ROOT)\src\server $(MAKE) $(TARGET) -kmlmc: build-tools .virtual +kmlmc: .virtual cd $(DEVELOPER_ROOT)\src\kmlmc $(MAKE) $(TARGET) @@ -217,9 +217,7 @@ build-tools: !ifdef NODELPHI echo Skipping build-tools !else -# we need to build devtools directly because otherwise we have a -# chicken-and-egg issue with PathDefines.mak - @if not exist $(WINDOWS_ROOT)\src\PathDefines.mak $(MAKE) build-tools-internal + $(MAKE) build-tools-internal !endif build-tools-internal: diff --git a/developer/src/ext/Makefile b/developer/src/ext/Makefile index c89c79c04f..c3b9206ce0 100644 --- a/developer/src/ext/Makefile +++ b/developer/src/ext/Makefile @@ -7,7 +7,7 @@ NOTARGET_SIGNCODE=yes !ifdef NODELPHI TARGETS=.virtual !else -TARGETS=browse4folder mbcolor common +TARGETS=browse4folder mbcolor scfontcombobox common !endif CLEANS= @@ -24,6 +24,10 @@ mbcolor: .virtual cd $(DEVELOPER_ROOT)\src\ext\mbcolor $(MAKE) $(TARGET) +scfontcombobox: .virtual + cd $(DEVELOPER_ROOT)\src\ext\scfontcombobox + $(MAKE) $(TARGET) + # ---------------------------------------------------------------------- common: .virtual diff --git a/windows/src/ext/scfontcombobox/Makefile b/developer/src/ext/scfontcombobox/Makefile similarity index 80% rename from windows/src/ext/scfontcombobox/Makefile rename to developer/src/ext/scfontcombobox/Makefile index 84363bf38b..002a14408d 100644 --- a/windows/src/ext/scfontcombobox/Makefile +++ b/developer/src/ext/scfontcombobox/Makefile @@ -11,7 +11,7 @@ build: dirs install: $(DEVTOOLS) -ip $(OUTLIB)\scFontCombo.bpl - $(DEVTOOLS) -ai $(EXT)\scfontcombobox + $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\scfontcombobox clean: def-clean diff --git a/windows/src/ext/scfontcombobox/TscFontcombobox_Readme.htm b/developer/src/ext/scfontcombobox/TscFontcombobox_Readme.htm similarity index 100% rename from windows/src/ext/scfontcombobox/TscFontcombobox_Readme.htm rename to developer/src/ext/scfontcombobox/TscFontcombobox_Readme.htm diff --git a/windows/src/ext/scfontcombobox/scFontCombo.dpk b/developer/src/ext/scfontcombobox/scFontCombo.dpk similarity index 100% rename from windows/src/ext/scfontcombobox/scFontCombo.dpk rename to developer/src/ext/scfontcombobox/scFontCombo.dpk diff --git a/windows/src/ext/scfontcombobox/scFontCombo.dproj b/developer/src/ext/scfontcombobox/scFontCombo.dproj similarity index 100% rename from windows/src/ext/scfontcombobox/scFontCombo.dproj rename to developer/src/ext/scfontcombobox/scFontCombo.dproj diff --git a/windows/src/ext/scfontcombobox/scFontCombo.res b/developer/src/ext/scfontcombobox/scFontCombo.res similarity index 100% rename from windows/src/ext/scfontcombobox/scFontCombo.res rename to developer/src/ext/scfontcombobox/scFontCombo.res diff --git a/windows/src/ext/scfontcombobox/scFontComboBox.dcr b/developer/src/ext/scfontcombobox/scFontComboBox.dcr similarity index 100% rename from windows/src/ext/scfontcombobox/scFontComboBox.dcr rename to developer/src/ext/scfontcombobox/scFontComboBox.dcr diff --git a/windows/src/ext/scfontcombobox/scFontComboBox.res b/developer/src/ext/scfontcombobox/scFontComboBox.res similarity index 100% rename from windows/src/ext/scfontcombobox/scFontComboBox.res rename to developer/src/ext/scfontcombobox/scFontComboBox.res diff --git a/windows/src/ext/scfontcombobox/scFontCombobox.dfm b/developer/src/ext/scfontcombobox/scFontCombobox.dfm similarity index 100% rename from windows/src/ext/scfontcombobox/scFontCombobox.dfm rename to developer/src/ext/scfontcombobox/scFontCombobox.dfm diff --git a/windows/src/ext/scfontcombobox/scFontCombobox.pas b/developer/src/ext/scfontcombobox/scFontCombobox.pas similarity index 100% rename from windows/src/ext/scfontcombobox/scFontCombobox.pas rename to developer/src/ext/scfontcombobox/scFontCombobox.pas diff --git a/windows/src/ext/Makefile b/windows/src/ext/Makefile index 14cb92d5e6..b011ba798e 100644 --- a/windows/src/ext/Makefile +++ b/windows/src/ext/Makefile @@ -7,7 +7,7 @@ NOTARGET_SIGNCODE=yes !ifdef NODELPHI TARGETS=.virtual !else -TARGETS=common jedi scfontcombobox cef4delphi +TARGETS=common jedi cef4delphi !endif # jedi has no packages @@ -36,10 +36,6 @@ vclzip: .virtual cd $(ROOT)\src\ext\vclzip $(MAKE) $(TARGET) -scfontcombobox: .virtual - cd $(ROOT)\src\ext\scfontcombobox - $(MAKE) $(TARGET) - # # #