diff --git a/.gitattributes b/.gitattributes index 80f0edef07..f1ace66ea0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2632,22 +2632,22 @@ tools/find_non_cvs_files.pl -text svneol=native#application/x-perl tools/getallmofiles.sh -text svneol=native#application/x-sh tools/getallpofiles.sh -text svneol=native#application/x-sh tools/install/README.txt svneol=native#text/plain -tools/install/build_fpc-src_rpm.sh svneol=native#text/plain -tools/install/build_fpc_rpm.sh svneol=native#text/plain tools/install/build_fpc_snaphot_rpm.sh svneol=native#text/plain tools/install/check_fpc_dependencies.sh svneol=native#text/plain tools/install/create_clean_fpcsrc_directory.sh svneol=native#text/plain tools/install/create_clean_lazarus_directory.sh svneol=native#text/plain tools/install/create_fpc-src_deb.sh svneol=native#text/plain +tools/install/create_fpc-src_rpm.sh svneol=native#text/plain tools/install/create_fpc_deb.sh svneol=native#text/plain tools/install/create_fpc_export_tgz.sh svneol=native#text/plain +tools/install/create_fpc_rpm.sh svneol=native#text/plain tools/install/create_fpc_tgz_from_local_dir.sh svneol=native#text/plain tools/install/create_lazarus_deb.sh svneol=native#text/plain tools/install/create_lazarus_export_tgz.sh svneol=native#text/plain tools/install/create_lazarus_rpm.sh svneol=native#text/plain tools/install/create_lazarus_snapshot_rpm.sh svneol=native#text/plain tools/install/cross_unix/HowToCreate_fpc_crosswin32_rpm.txt svneol=native#text/plain -tools/install/cross_unix/build_linux_cross_win32_rpm.sh svneol=native#text/plain +tools/install/cross_unix/create_linux_cross_win32_rpm.sh svneol=native#text/plain tools/install/cross_unix/update_cross_fpc.sh svneol=native#text/plain tools/install/cvsexportlocal.pas svneol=native#text/pascal tools/install/debian_fpc/changelog svneol=native#text/plain diff --git a/tools/install/README.txt b/tools/install/README.txt index 9a5a18d684..42119c571b 100644 --- a/tools/install/README.txt +++ b/tools/install/README.txt @@ -70,11 +70,11 @@ Creating the fpc and the fpc-src rpm: If you have your own fpc sources you can build the fpc rpm with: []$ cd /tools/install - []$ ./build_fpc_rpm.sh nodocs /path/to/your/fpc/sources/fpc + []$ ./create_fpc_rpm.sh nodocs /path/to/your/fpc/sources/fpc Then build the fpc-src rpm: - []$ ./build_fpc-src_rpm.sh /path/to/your/fpc/sources/fpc + []$ ./create_fpc-src_rpm.sh /path/to/your/fpc/sources/fpc Normally you can find the rpms under /usr/src/redhat/RPMS/i386/ and /usr/src/redhat/SRPMS/. diff --git a/tools/install/build_fpc-src_rpm.sh b/tools/install/create_fpc-src_rpm.sh similarity index 100% rename from tools/install/build_fpc-src_rpm.sh rename to tools/install/create_fpc-src_rpm.sh diff --git a/tools/install/build_fpc_rpm.sh b/tools/install/create_fpc_rpm.sh similarity index 100% rename from tools/install/build_fpc_rpm.sh rename to tools/install/create_fpc_rpm.sh diff --git a/tools/install/create_lazarus_deb.sh b/tools/install/create_lazarus_deb.sh index cc6bbb0f5b..b24e28c4e1 100755 --- a/tools/install/create_lazarus_deb.sh +++ b/tools/install/create_lazarus_deb.sh @@ -52,6 +52,7 @@ if [ -n "$FPCCfg" ]; then MAKEOPTS="$MAKEOPTS -n @$FPCCfg" fi make bigide OPT="$MAKEOPTS" USESVN2REVISIONINC=0 +make lazbuilder OPT="$MAKEOPTS" make tools OPT="$MAKEOPTS" # build gtk2 .ppu export LCL_PLATFORM=gtk2 @@ -59,6 +60,7 @@ make lcl ideintf packager/registration bigidecomponents OPT="$MAKEOPTS" export LCL_PLATFORM= strip lazarus strip startlazarus +strip lazbuild cd - # create control file @@ -85,6 +87,10 @@ install -m 644 $LazDestDir/images/ide_icon48x48.png $LazBuildDir/usr/share/pixma install -m 644 $LazDestDir/install/lazarus.desktop $LazBuildDir/usr/share/applications/lazarus.desktop ln -s $LazDestDir/lazarus $LazBuildDir/usr/bin/lazarus ln -s $LazDestDir/startlazarus $LazBuildDir/usr/bin/startlazarus +ln -s $LazDestDir/lazbuild $LazBuildDir/usr/bin/lazbuild + +# docs +cat $LazBuildDir/docs/lazbuild.1 | gzip > $LazBuildDir/usr/share/man/man1/lazbuild.1.gz # fixing permissions echo "fixing permissions ..." diff --git a/tools/install/cross_unix/HowToCreate_fpc_crosswin32_rpm.txt b/tools/install/cross_unix/HowToCreate_fpc_crosswin32_rpm.txt index 1828ebe368..c1f205a15b 100644 --- a/tools/install/cross_unix/HowToCreate_fpc_crosswin32_rpm.txt +++ b/tools/install/cross_unix/HowToCreate_fpc_crosswin32_rpm.txt @@ -9,7 +9,7 @@ First get the FPC sources and the binutils. For example: []$ cd /tools/install/cross_unix/ - []$ ./build_linux_cross_win32_rpm.sh downloadbinutils downloadfpc buildbinutils + []$ ./create_linux_cross_win32_rpm.sh downloadbinutils downloadfpc buildbinutils This will download the FPC svn to ~/freepascal/fpc, its install files to ~/freepascal/install and the binutils to ~/freepascal/binutils. @@ -17,12 +17,12 @@ This will download the FPC svn to ~/freepascal/fpc, its install files to Create the fpc rpm and install it: []$ cd /tools/install - []$ ./build_fpc_rpm.sh ~/freepascal/fpc + []$ ./create_fpc_rpm.sh ~/freepascal/fpc []$ sudo rpm -Uvh /RPMS/i386/fpc-.i386.rpm Then build the fpc_crosswin32 rpm and install it: []$ cd /tools/install/cross_unix/ - []$ ./build_linux_cross_win32_rpm.sh buildcrossfpc buildcrosswin32rpm + []$ ./create_linux_cross_win32_rpm.sh buildcrossfpc buildcrosswin32rpm []$ sudo rpm -Uvh /RPMS/i386/fpc_crosswin32-.i386.rpm Now you can cross compile from linux to win32. diff --git a/tools/install/cross_unix/build_linux_cross_win32_rpm.sh b/tools/install/cross_unix/create_linux_cross_win32_rpm.sh similarity index 100% rename from tools/install/cross_unix/build_linux_cross_win32_rpm.sh rename to tools/install/cross_unix/create_linux_cross_win32_rpm.sh diff --git a/tools/install/rpm/lazarus.spec.template b/tools/install/rpm/lazarus.spec.template index 06a7319e80..5b0916bea4 100644 --- a/tools/install/rpm/lazarus.spec.template +++ b/tools/install/rpm/lazarus.spec.template @@ -33,13 +33,14 @@ if [ -n "$FPCCfg" ]; then fi make bigide OPT="$MAKEOPTS" USESVN2REVISIONINC=0 make tools OPT="$MAKEOPTS" -make lazbuild OPT="$MAKEOPTS" +make lazbuilder OPT="$MAKEOPTS" # build gtk2 .ppu export LCL_PLATFORM=gtk2 make lcl ideintf packager/registration bigidecomponents OPT="$MAKEOPTS" export LCL_PLATFORM= strip lazarus strip startlazarus +strip lazbuild %install [ %{buildroot} != "/" ] && ( rm -rf %{buildroot} ) @@ -48,14 +49,14 @@ mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_datadir}/pixmaps # mkdir -p %{buildroot}%{_datadir}/gnome/apps/Development mkdir -p %{buildroot}%{_datadir}/applications -mkdir -p %{buildroot}%{_mandir} +mkdir -p %{buildroot}%{_mandir}/man1 cp -a lazarus/* %{buildroot}%{_libdir}/%{name}/ install -m 644 lazarus/images/ide_icon48x48.png %{buildroot}%{_datadir}/pixmaps/lazarus.png install -m 644 lazarus/install/lazarus.desktop %{buildroot}%{_datadir}/applications/lazarus.desktop ln -sf ../%{_lib}/%{name}/lazarus %{buildroot}%{_bindir}/lazarus ln -sf ../%{_lib}/%{name}/startlazarus %{buildroot}%{_bindir}/startlazarus ln -sf ../%{_lib}/%{name}/lazbuild %{buildroot}%{_bindir}/lazbuild -cat lazarus/docs/lazbuild.1 | gzip > %{_mandir}/man1/lazbuild.1.gz +cat lazarus/docs/lazbuild.1 | gzip > %{buildroot}%{_mandir}/man1/lazbuild.1.gz %clean [ %{buildroot} != "/" ] && ( rm -rf %{buildroot} )