paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 14:20:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed make examples to not recompile IDE

Browse Source 
git-svn-id: trunk@7712 -
This commit is contained in:
mattias 2005-09-16 08:42:20 +00:00
parent f6cdf3cd65
commit ca797822c7
6 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -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

6
Makefile.fpc
View File

@ -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

2
designer/designer.pp
View File

@ -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

13
tools/install/build_fpc_rpm.sh
View File

@ -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

5
tools/install/rpm/fpc.spec.template
View File

@ -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}/*

2
tools/install/rpm/lazarus.spec.template
View File

@ -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