From ca797822c7e54742dd3db73b63d7e07757c380b0 Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 16 Sep 2005 08:42:20 +0000 Subject: [PATCH] fixed make examples to not recompile IDE git-svn-id: trunk@7712 - --- Makefile | 7 ++++--- Makefile.fpc | 6 +++++- designer/designer.pp | 2 +- tools/install/build_fpc_rpm.sh | 13 ++++++------- tools/install/rpm/fpc.spec.template | 5 ++--- tools/install/rpm/lazarus.spec.template | 2 +- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 15ccd0d026..1ba1a62b32 100644 --- a/Makefile +++ b/Makefile @@ -3295,7 +3295,6 @@ debug: fpc_debug smart: fpc_smart release: fpc_release units: fpc_units $(addsuffix _units,$(TARGET_DIRS)) -examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS)) shared: $(addsuffix _shared,$(TARGET_DIRS)) install: fpc_install $(addsuffix _install,$(TARGET_DIRS)) sourceinstall: fpc_sourceinstall @@ -3309,11 +3308,11 @@ distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS)) cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS)) info: fpc_info makefiles: fpc_makefiles -.PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info makefiles +.PHONY: debug smart release units shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif -.PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge +.PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge examples ide: $(MAKE) -C ide ide idepkg: @@ -3322,6 +3321,8 @@ starter: $(MAKE) -C ide starter tools: lcl components $(MAKE) -C tools +examples: lcl components + $(MAKE) -C examples all: lcl components packager/registration ideintf designer packager ide starter cleanide: $(MAKE) -C ide cleanide diff --git a/Makefile.fpc b/Makefile.fpc index eb435dc2a0..9f71ef9774 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -32,7 +32,7 @@ RCPP?=$(strip $(firstword cpp$(SRCEXEEXT))) #----------------------------------------------------------------------------- [rules] -.PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge +.PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge examples #----------------------------------------------------------------------------- ide: @@ -49,6 +49,10 @@ starter: #----------------------------------------------------------------------------- tools: lcl components $(MAKE) -C tools + +#----------------------------------------------------------------------------- +examples: lcl components + $(MAKE) -C examples #----------------------------------------------------------------------------- all: lcl components packager/registration ideintf designer packager ide starter diff --git a/designer/designer.pp b/designer/designer.pp index 97589b9e1d..4a76dd2759 100644 --- a/designer/designer.pp +++ b/designer/designer.pp @@ -1211,7 +1211,7 @@ Begin ControlSelection.Delete(CompIndex); end; end else begin - // no shift key (single selection or kept multiselection) + // no shift key (single selection or keeping multiselection) if (CompIndex<0) then begin // select only this component diff --git a/tools/install/build_fpc_rpm.sh b/tools/install/build_fpc_rpm.sh index 74570c279d..f44d289047 100755 --- a/tools/install/build_fpc_rpm.sh +++ b/tools/install/build_fpc_rpm.sh @@ -88,7 +88,7 @@ ReplaceScript=replace_in_files.pl perl replace_in_files.pl -sR -f '=\d.\d.\d' -r =$CompilerVersionStr -m 'Makefile(.fpc)?' $TmpDir/* # update smart_strip.sh -#cp $SmartStripScript $TmpDir/install/ +#ATM: not needed: cp $SmartStripScript $TmpDir/install/ if [ "$PkgType" = "deb" ]; then # build fpc debs @@ -137,20 +137,19 @@ if [ "$PkgType" = "deb" ]; then else # build fpc rpm + SpecFileTemplate=rpm/fpc.spec.template SpecFile=rpm/fpc.spec SrcPatch=fpcsrc-patch - # update smart_strip.sh - # ATM not needed: cp $SmartSripScript $TmpDir/install/ - # change spec file - cat $SpecFile | \ + cat $SpecFileTemplate | \ sed -e 's/^Version: .*/Version: '"$LazVersion/" \ -e 's/^Release: .*/Release: '"$LazRelease/" \ - > $SpecFile.New + > $SpecFile # -e 's/\(%define builddocdir.*\)/%define __strip smart_strip.sh\n\n\1/' \ # -e 's/^\%{fpcdir}\/samplecfg .*/%{fpcdir}\/samplecfg %{_libdir}\/fpc\/\\\$version/' \ - mv $SpecFile.New $SpecFile + + tar cvz $TempDir/fpc-$CompilerVersionStr-$LazRelease.source.tar.gz /usr/src/redhat/SOURCES/$TempDir/fpc #---------------------------------------------------------------------------- # compile diff --git a/tools/install/rpm/fpc.spec.template b/tools/install/rpm/fpc.spec.template index 69f6420b59..5bed2fc028 100644 --- a/tools/install/rpm/fpc.spec.template +++ b/tools/install/rpm/fpc.spec.template @@ -9,8 +9,8 @@ URL: http://www.freepascal.org/ Source0: ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}-%{release}.source.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Requires: gpm, gpm-devel, glibc, ncurses, binutils -Requires: glibc, binutils +#Requires: gpm, gpm-devel, glibc, ncurses, binutils +Requires: glibc, binutils #BuildRequires: tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel BuildRequires: binutils, glibc-devel @@ -134,7 +134,6 @@ rm -rf %{buildroot} # Create a version independent config %{_libdir}/%{name}/%{version}/samplecfg %{_libdir}/%{name}/%{version} > /dev/null - %files %defattr(-,root,root,-) %{_bindir}/* diff --git a/tools/install/rpm/lazarus.spec.template b/tools/install/rpm/lazarus.spec.template index 4487fa60a5..42fe906268 100644 --- a/tools/install/rpm/lazarus.spec.template +++ b/tools/install/rpm/lazarus.spec.template @@ -10,7 +10,7 @@ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}-%{ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: -Requires: fpc-src = FPCVERSION, fpc = FPCVERSION, gdk-pixbuf-devel, gtk+, gtk+-devel, gdb, glibc-devel, gdk-pixbuf +Requires: fpc-src = FPCVERSION, fpc = FPCVERSION, gdk-pixbuf-devel, gtk+, gtk+-devel, gdb, glibc-devel, gdk-pixbuf Requires(post): desktop-file-utils Requires(postun): desktop-file-utils