mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-06 07:58:07 +02:00
MAKE DEB: Got rid of debian scpecific patches for make files after build system rework byt upstream.
git-svn-id: trunk@37820 -
This commit is contained in:
mazen
parent
113840d1a9
commit
1f5fb77fda
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -3027,8 +3027,6 @@ debian/overrides/lazarus-ide svneol=native#text/plain
|
||||
debian/overrides/lazarus-ide-gtk2 svneol=native#text/plain
|
||||
debian/overrides/lcl-units svneol=native#text/plain
|
||||
debian/overrides/lcl-utils svneol=native#text/plain
|
||||
debian/patches/01_topmakefile.diff svneol=native#text/plain
|
||||
debian/patches/02_components.diff svneol=native#text/plain
|
||||
debian/patches/default_config.diff svneol=native#text/plain
|
||||
debian/patches/lcl-with-multple-widget-sets.diff svneol=native#text/plain
|
||||
debian/patches/series svneol=native#text/plain
|
||||
|
||||
68
debian/patches/01_topmakefile.diff
vendored
68
debian/patches/01_topmakefile.diff
vendored
@ -1,68 +0,0 @@
|
||||
This patch fixes dist_clean target used to remove generated files before
|
||||
packaging sources.
|
||||
|
||||
diff -urNad lazarus~/Makefile.fpc lazarus/Makefile.fpc
|
||||
Index: lazarus/ide/Makefile.fpc
|
||||
===================================================================
|
||||
--- lazarus/ide/Makefile.fpc (revision 36339)
|
||||
+++ lazarus/ide/Makefile.fpc (working copy)
|
||||
@@ -180,7 +180,7 @@
|
||||
endif
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
-all: ide starter lazbuilder
|
||||
+all: bigide starter lazbuilder
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
cleanide:
|
||||
Index: lazarus/Makefile.fpc
|
||||
===================================================================
|
||||
--- lazarus/Makefile.fpc (revision 36339)
|
||||
+++ lazarus/Makefile.fpc (working copy)
|
||||
@@ -10,8 +10,8 @@
|
||||
packages=regexpr
|
||||
|
||||
[target]
|
||||
-programs=lazarus startlazarus
|
||||
-dirs=lcl packager/registration ideintf components
|
||||
+programs=
|
||||
+dirs=packager/registration components/lazutils lcl ideintf components ide tools examples
|
||||
exampledirs=examples
|
||||
|
||||
[compiler]
|
||||
@@ -51,8 +51,9 @@
|
||||
help:
|
||||
@$(ECHO)
|
||||
@$(ECHO) " Targets"
|
||||
- @$(ECHO) " all build minimal IDE, lazbuild, startlazarus"
|
||||
+ @$(ECHO) " all build IDE with all packages, lazbuild, startlazarus"
|
||||
@$(ECHO) " clean deletes files that 'all' creates"
|
||||
+ @$(ECHO) " ide build IDE with a minimal set of packages"
|
||||
@$(ECHO) " lazbuild build lazbuild and lcl with nogui widgetset"
|
||||
@$(ECHO) " starter build startlazarus"
|
||||
@$(ECHO) " bigide build IDE with some stable extra packages"
|
||||
@@ -106,8 +107,8 @@
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# build lazarus and packages with user's settings
|
||||
-useride:
|
||||
- ./lazbuild$(SRCEXEEXT) --build-ide=
|
||||
+useride: lazbuild
|
||||
+ ./lazbuild $(SRCEXEEXT) --build-ide=
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# build lazarus,lcl,startlazarus with bigide packages
|
||||
@@ -135,12 +136,9 @@
|
||||
$(MAKE) -C tools
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
-examples: lazutils lcl bigidecomponents
|
||||
+examples: lcl bigidecomponents
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
-all: lazbuild lcl ideintf components tools ide starter
|
||||
-
|
||||
-#-----------------------------------------------------------------------------
|
||||
cleanide:
|
||||
$(MAKE) -C ide cleanide
|
||||
|
||||
28
debian/patches/02_components.diff
vendored
28
debian/patches/02_components.diff
vendored
@ -1,28 +0,0 @@
|
||||
This patch fixes compilation of printer support units on architectures which do
|
||||
not have libc unit (ie all except i386).
|
||||
|
||||
Index: components/Makefile.fpc
|
||||
===================================================================
|
||||
--- lazarus~/components/Makefile.fpc (révision 15506)
|
||||
+++ lazarus/components/Makefile.fpc (copie de travail)
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
|
||||
[target]
|
||||
-dirs=lazutils codetools synedit lazcontrols
|
||||
+dirs=lazutils codetools synedit lazcontrols printers printers/design fpcunit fpcunit/ide memds projecttemplates rtticontrols sdf sqldb tachart tdbf turbopower_ipro jcf2/IdePlugin/lazarus todolist chmhelp/packages/help chmhelp/packages/idehelp instantfpc externhelp leakview
|
||||
|
||||
[clean]
|
||||
files=$(wildcard ./units/*$(OEXT)) \
|
||||
Index: components/turbopower_ipro/Makefile.fpc
|
||||
===================================================================
|
||||
--- lazarus~/components/turbopower_ipro/Makefile.fpc (révision 17880)
|
||||
+++ lazarus/components/turbopower_ipro/Makefile.fpc (copie de travail)
|
||||
@@ -15,6 +15,7 @@
|
||||
|
||||
[target]
|
||||
units=turbopoweripro.pas
|
||||
+dirs=design
|
||||
|
||||
[clean]
|
||||
files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
|
||||
92
debian/patches/lcl-with-multple-widget-sets.diff
vendored
92
debian/patches/lcl-with-multple-widget-sets.diff
vendored
@ -1,86 +1,14 @@
|
||||
This patch enable building all linux supported LCL widget sets.
|
||||
|
||||
Index: lazarus-0.9.30.4/lcl/Makefile.fpc
|
||||
===================================================================
|
||||
--- lazarus-0.9.30.4/lcl/Makefile.fpc
|
||||
+++ lazarus-0.9.30.4/lcl/Makefile.fpc
|
||||
@@ -90,7 +90,7 @@
|
||||
[compiler]
|
||||
options=-gl $(LCL_DISABLE_CHECKS)
|
||||
unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)
|
||||
-unitdir=. $(NONWIN32) forms widgetset
|
||||
+unitdir=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
|
||||
includedir=include
|
||||
diff --git a/lcl/Makefile.fpc b/lcl/Makefile.fpc
|
||||
index ecd40c3..dd35600 100644
|
||||
--- a/lcl/Makefile.fpc
|
||||
+++ b/lcl/Makefile.fpc
|
||||
@@ -152,6 +152,7 @@ cleanintf:
|
||||
$(MAKE) -C interfaces clean
|
||||
|
||||
[install]
|
||||
@@ -101,28 +101,66 @@
|
||||
files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
|
||||
$(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
|
||||
$(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
|
||||
+ $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) \
|
||||
+ $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) \
|
||||
+ $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) \
|
||||
$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) \
|
||||
$(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))\
|
||||
$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||
|
||||
-
|
||||
[default]
|
||||
lcldir=.
|
||||
|
||||
[rules]
|
||||
-.PHONY: cleartarget all
|
||||
+.PHONY: help cleartarget lclbase all intf cleanintf cleanlaz cleanall
|
||||
|
||||
+help:
|
||||
+ @$(ECHO)
|
||||
+ @$(ECHO) " Important: the LCL requires components/lazutils and packager/registration"
|
||||
+ @$(ECHO)
|
||||
+ @$(ECHO) " Targets"
|
||||
+ @$(ECHO) " all build lclbase and one interface"
|
||||
+ @$(ECHO) " clean deletes files that 'all' creates"
|
||||
+ @$(ECHO) " lclbase build lclbase"
|
||||
+ @$(ECHO) " intf build one lcl interface, selectable via LCL_PLATFORM"
|
||||
+ @$(ECHO) " cleanintf delete files that 'intf' creates"
|
||||
+ @$(ECHO) " cleanall as 'clean' plus clean for all common interfaces."
|
||||
+ @$(ECHO) " Does not clean up cross compiled interfaces."
|
||||
+ @$(ECHO)
|
||||
+ @$(ECHO) " Examples:"
|
||||
+ @$(ECHO)
|
||||
+ @$(ECHO) " Compile the lcl with the default interface:"
|
||||
+ @$(ECHO) " make clean all"
|
||||
+ @$(ECHO)
|
||||
+ @$(ECHO) " Compile the interface for the qt widgetset:"
|
||||
+ @$(ECHO) " make cleanintf intf LCL_PLATFORM=qt"
|
||||
+ @$(ECHO)
|
||||
+ @$(ECHO) "Clean up:"
|
||||
+ @$(ECHO) " There is no command to clean up all interfaces."
|
||||
+ @$(ECHO) " In most cases it is enough to delete the 'units' directory."
|
||||
+ @$(ECHO)
|
||||
+
|
||||
cleartarget:
|
||||
-$(DEL) $(COMPILER_UNITTARGETDIR)/alllclunits$(PPUEXT)
|
||||
|
||||
-all: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT) $(TARGET_DIRS)
|
||||
+lclbase: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT)
|
||||
|
||||
-cleanlaz: clean
|
||||
+intf: $(TARGET_DIRS)
|
||||
+
|
||||
+cleanintf:
|
||||
+ $(MAKE) -C interfaces clean
|
||||
+
|
||||
+all: lclbase
|
||||
all: lclbase compiled intf
|
||||
+ for WS in gtk2 nogui qt ; do ${MAKE} intf LCL_PLATFORM=$${WS} ; done
|
||||
+
|
||||
+cleanlaz: cleanall
|
||||
+cleanall: clean
|
||||
$(MAKE) -C interfaces clean
|
||||
$(MAKE) -C interfaces/carbon clean
|
||||
$(MAKE) -C interfaces/fpgui clean
|
||||
$(MAKE) -C interfaces/gtk clean
|
||||
$(MAKE) -C interfaces/gtk2 clean
|
||||
+ $(MAKE) -C interfaces/nogui clean
|
||||
$(MAKE) -C interfaces/qt clean
|
||||
$(MAKE) -C interfaces/win32 clean
|
||||
$(MAKE) -C interfaces/wince clean
|
||||
|
||||
cleanlaz: cleanall
|
||||
cleanall: clean
|
||||
|
||||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -1,4 +1,2 @@
|
||||
01_topmakefile.diff
|
||||
02_components.diff
|
||||
default_config.diff
|
||||
lcl-with-multple-widget-sets.diff
|
||||
|
||||
4
debian/rules
vendored
4
debian/rules
vendored
@ -115,7 +115,7 @@ configure-stamp:
|
||||
# Remove auto-generated make files.
|
||||
find -name Makefile.fpc -execdir 'sh' '-c' '${RM} $$(basename {} .fpc)' ';'
|
||||
# Regenrate make files using fpcmake.
|
||||
${FPCMAKE} -r -Tall
|
||||
find -name Makefile.fpc -exec ${FPCMAKE} '{}' -Tall ';'
|
||||
# Remove auto-generated version file.
|
||||
${RM} ide/version.inc
|
||||
# Add version.inc:
|
||||
@ -126,7 +126,7 @@ build-arch: debian-files configure build-arch-stamp
|
||||
build-arch-stamp:
|
||||
@echo "--- Building"
|
||||
dh_testdir
|
||||
${MAKE} all ${BUILDOPTS}
|
||||
${MAKE} bigide ${BUILDOPTS}
|
||||
${MV} $(CURDIR)/lazarus $(CURDIR)/lazarus-gtk2
|
||||
touch build-arch-stamp
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user