From 9265403b8bfd3c1f20f81a52a3f2c6f7711dffb5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 2 Jul 2007 19:40:54 +0000 Subject: [PATCH] Get rid of eclipse fiels once and for all. Homogenise the references to crosstool-NG: - the project is named "crosstool-NG" - the front-end is named "ct-ng" - don't use shortcuts (such as "ct-ng" to stand for "crosstool-NG") Default action is to print help. Don't speak of make rules when dumping help, just speak of actions. --- .cdtproject | 67 --------------------------------------- .project | 34 -------------------- CREDITS | 4 +-- Makefile.in | 2 +- config/global.in | 14 ++++---- configure | 4 +-- ct-ng.in | 20 ++++++------ docs/ct-ng.1.in | 38 ++++++++++------------ docs/overview.txt | 25 ++++++++------- kconfig/Makefile | 2 +- scripts/crosstool.sh | 2 +- scripts/tarball.sh.broken | 4 +-- tools/extractConfig.sh | 4 +-- 13 files changed, 58 insertions(+), 162 deletions(-) delete mode 100644 .cdtproject delete mode 100644 .project diff --git a/.cdtproject b/.cdtproject deleted file mode 100644 index 69405851..00000000 --- a/.cdtproject +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -make - -all -true -true - - - - - diff --git a/.project b/.project deleted file mode 100644 index 521ece31..00000000 --- a/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - crosstool-ng - - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/org.eclipse.cdt.make.core.makeBuilder.launch - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/org.eclipse.cdt.make.core.ScannerConfigBuilder.launch - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.make.core.makeNature - org.eclipse.cdt.make.core.ScannerConfigNature - - diff --git a/CREDITS b/CREDITS index 2fdfa374..9df8bf60 100644 --- a/CREDITS +++ b/CREDITS @@ -9,8 +9,8 @@ I would like to thank these fine people for making crosstool-NG possible: And in order of appearance on the crossgcc ML: Allan CLARK for his investigations on building toolchains on MacOS-X. - Allan made extensive tests of the first alpha of ct-ng on his MacOS-X - and unveiled some bash-2.05 weirdness. + Allan made extensive tests of the first alpha of crosstool-NG-ng on his + MacOS-X, and unveiled some bash-2.05 weirdness. Enrico WEIGELT for some improvements of the build procedure: - cxa_atexit disabling for C libraries not supporting it (uClibc) diff --git a/Makefile.in b/Makefile.in index 2e7b75cb..a1f90980 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in for building crosstool-ng +# Makefile.in for building crosstool-NG # This file serves as source for the ./configure operation all: build diff --git a/config/global.in b/config/global.in index 7f1ba816..001eaac8 100644 --- a/config/global.in +++ b/config/global.in @@ -9,7 +9,7 @@ config FOOBAR menu "Paths and misc options" -comment "Crosstool-ng behavior" +comment "crosstool-NG behavior" config EXPERIMENTAL bool @@ -172,11 +172,11 @@ config CUSTOM_PATCH_ONLY default n depends on CUSTOM_PATCH help - Don't apply patches coming with CT-NG, only those patches available in - the directory below. + Don't apply patches coming with crosstool-NG, only those patches available + in the directory below. - If you say 'N' here, then the patches provided with CT-NG will be applied - first, and then your patches. + If you say 'N' here, then the patches provided with crosstool-NG will be + applied first, and then your patches. config CUSTOM_PATCH_DIR string @@ -311,14 +311,14 @@ config LOG_SEE_TOOLS_WARN default n depends on ! LOG_ERROR help - Treat warnings from the different tools as crosstool-ng warnings. + Treat warnings from the different tools as crosstool-NG warnings. If you say 'y' here, then those warnings will be prefixed with '[WARN ]' instead of the default '[ALL ]'. You can safely say 'n' here. Those warnings will anyway be recorded in the log file (provided you configured one). - Tools error will always be logged as crosstool-ng errors. + Tools error will always be logged as crosstool-NG errors. config LOG_PROGRESS_BAR bool diff --git a/configure b/configure index b2109cc6..485932d5 100755 --- a/configure +++ b/configure @@ -71,7 +71,7 @@ set_mandir() { do_help() { cat <<__EOF__ -\`configure' configures ct-ng ${VERSION} to adapt to many kind of systems. +\`configure' configures crosstool-NG ${VERSION} to adapt to many kind of systems. USAGE: ./configure [OPTION]... @@ -129,7 +129,7 @@ sed -r -e "s,@@BINDIR@@,${BINDIR},g;" \ Makefile.in >Makefile cat <<__EOF__ -ct-ng configured as follows: +crosstool-NG configured as follows: PREFIX="${PREFIX}" BINDIR="${BINDIR}" LIBDIR="${LIBDIR}" diff --git a/ct-ng.in b/ct-ng.in index fc47ea7b..08927880 100644 --- a/ct-ng.in +++ b/ct-ng.in @@ -13,7 +13,7 @@ export CT_TOP_DIR:=$(shell pwd) export CT_LIB_DIR:=@@CT_LIBDIR@@ export CT_DOC_DIR:=@@CT_DOCDIR@@ -# This is crosstool-ng version string +# This is crosstool-NG version string export CT_VERSION=$(shell cat $(CT_LIB_DIR)/version) export CT_STOP=$(STOP) @@ -21,7 +21,7 @@ export CT_RESTART=$(RESTART) .PHONY: $(PHONY) PHONY += all -all: build +all: help HOST_CC = gcc -funsigned-char @@ -29,23 +29,23 @@ HOST_CC = gcc -funsigned-char help:: help-head help-config help-samples help-build help-distrib help-env help-tail help-head:: - @echo 'Available make rules:' + @echo 'Available actions:' help-config:: @echo - @echo 'Configuration rules:' + @echo 'Configuration actions:' help-samples:: @echo - @echo 'Preconfigured rules:' + @echo 'Preconfigured actions:' help-build:: @echo - @echo 'Build rules:' + @echo 'Build actions:' help-distrib:: @echo - @echo 'Distribution rules:' + @echo 'Distribution actions:' help-env:: @echo @@ -53,14 +53,14 @@ help-env:: help-tail:: @echo - @echo 'Execute "$(CT_NG) config" or "$(CT_NG) menuconfig" to configure ct-ng' - @echo 'Execute "$(CT_NG)" or "$(CT_NG) all" to build all targets marked with [*]' + @echo 'Execute "$(CT_NG) config" or "$(CT_NG) menuconfig" to configure crosstool-NG' + @echo 'Execute "$(CT_NG) build" to build your toolchain' @echo 'See "man 1 ct-ng" for some help as well' # End help system help-build:: - @echo '* build - Build the toolchain' + @echo ' build - Build the toolchain' @echo ' clean - Remove generated files' @echo ' distclean - Remove generated files, configuration and build directories' diff --git a/docs/ct-ng.1.in b/docs/ct-ng.1.in index ac033dc1..fdf51e29 100644 --- a/docs/ct-ng.1.in +++ b/docs/ct-ng.1.in @@ -1,15 +1,15 @@ -." crosstool-ng man page +." crosstool-NG man page ." Copyright 2007 Yann E. MORIN ." Licensed under the Creative Commons BY-SA, v2.5 ." ." Beautifying URLs .mso www.tmac ." -.TH ct-ng 1 "@@CT_DATE@@" "version @@CT_VERSION@@" "User Commands" +.TH crosstool-NG 1 "@@CT_DATE@@" "version @@CT_VERSION@@" "User Commands" ." ." .SH NAME -ct-ng, crosstool-ng \- Build cross-toolchains +ct-ng, crosstool-NG \- Build cross-toolchains ." ." .SH SYNOPSIS @@ -19,7 +19,7 @@ ct-ng, crosstool-ng \- Build cross-toolchains .SH DESCRIPTION Building a cross-toolchain can be a real pain. .PP -.B ct-ng +.B crosstool-NG makes it easy to build cross-toolchains, and allows you to take all the juice out of your target by configuring the differents components of the toolchain accordingly to the targeted processor. @@ -35,7 +35,7 @@ Prints a little help text. .TP .B menuconfig Configures -.B ct-ng +.B crosstool-NG using a configurator menu very similar to that of the Linux kernel. ." .TP @@ -47,7 +47,7 @@ file, and ask for newer options if there are any. .TP .B saveconfig Save the current -.B ct-ng +.B crosstool-NG configuration, and associated components' config files, into a sample. Samples are saved in their own sub-directory, named after the target's triplet, in the .I samples @@ -61,11 +61,7 @@ with the target triplet they represent. ." .TP .B build -Builds the configured toolchain. If -.B ct-ng -is called without action, then -.B build -is impiled. +Builds the configured toolchain. ." .TP .B liststeps @@ -76,7 +72,7 @@ below). .TP .B clean Remove files generated by -.B ct-ng +.B crosstool-NG for itself (these are mostly the configurators' binaries). ." .TP @@ -91,7 +87,7 @@ samples which are not removed. .TP .B regtest Calls the -.B ct-ng +.B crosstool-NG regression test suite. All samples are build, and the regression test suite is run against every one of them. ." @@ -102,12 +98,12 @@ Updates the and .I config.sub scripts. These scripts are used by -.B ct-ng +.B crosstool-NG to canonicalise the machines' name (host, build and target machines). .TP .B tarball Builds a tarball of the generated toolchain, also saving the scripts from -.B ct-ng +.B crosstool-NG that are needed to rebuild the target, and also saving the tarballs of the componnents that were used. ." @@ -132,27 +128,27 @@ to have the meaning of the exit values. .SH BUGS As of today (@@CT_DATE@@), building tarballs is broken. It is difficult to foresee how every parts of -.B ct-ng +.B crosstool-NG are going to be installed. Each parts is needed to build a tarball, as it contains all that is needed to rebuild the toolchain from scratch: toolchain components' sources, -.B ct-ng +.B crosstool-NG configuration, but also all -.B ct-ng +.B crosstool-NG scripts. ." .SH SECURITY .B Don't run as root! Great care has been taken to avoid mistakes, but bug-free programs don't exist. During normal operation, -.B ct-ng +.B crosstool-NG removes entire directories. If you run as root, and there is a bug or you mis-configured -.BR ct-ng , +.BR crosstool-NG , entire important directories could be removed (eg. .IR /usr ), although -.B ct-ng +.B crosstool-NG will refuse to install in some well known critical directories. ." .SH AUTHORS diff --git a/docs/overview.txt b/docs/overview.txt index e62a44df..b7ec27d4 100644 --- a/docs/overview.txt +++ b/docs/overview.txt @@ -1,5 +1,5 @@ File.........: overview.txt -Content......: Overview of how ct-ng works. +Content......: Overview of how crosstool-NG works. Copyrigth....: (C) 2007 Yann E. MORIN License......: Creative Commons Attribution Share Alike (CC-by-sa), v2.5 @@ -38,7 +38,7 @@ On the other side, these toolchain offer some advantages: - they are proven if used by a wide community. But once you want to get all the juice out of your specific hardware, you will -want to build your own toolchain. This is where crosstool-ng comes into play. +want to build your own toolchain. This is where crosstool-NG comes into play. There are also a number of tools that builds toolchains for specific needs, which is not really scalable. Examples are: @@ -80,9 +80,9 @@ in place, and add appropriate support for what I needed, that is uClibc support. The only option left to me was rewrite crosstool from scratch. I decided to go -this way, and name the new implementation ct-ng, standing for crosstool Next -Generation, as many other comunity projects do, and as a wink at the TV series -"Star Trek: The Next Generation". ;-) +this way, and name the new implementation crosstool-NG, standing for crosstool +Next Generation, as many other comunity projects do, and as a wink at the TV +series "Star Trek: The Next Generation". ;-) ____________________________ / @@ -126,7 +126,7 @@ Interesting config options | CT_LOCAL_TARBALLS_DIR: If you already have sone tarballs in a direcotry, enter it here. That will - speed up the retrieving phase, where crosstool-ng would otherwise download + speed up the retrieving phase, where crosstool-NG would otherwise download those tarballs. CT_PREFIX_DIR: @@ -148,7 +148,7 @@ ________________________ Running crosstool-NG / _____________________/ -ct-ng is configured by a configurator presenting a menu-stuctured set of +crosstool-NG is configured by a configurator presenting a menu-stuctured set of options. These options let you specify the way you want your toolchain built, where you want it installed, what architecture and specific processor it will support, the version of the components you want to use, etc... The @@ -235,29 +235,30 @@ this as "2 and 2 are 4". Here is how they come into play: one it is built on, and running again on this exact same machine. You have to build such a toolchain when you want to use an updated component, such as a newer gcc for example. - ct-ng calls it "native". + crosstool-NG calls it "native". 2) build == host != target This is a classic cross-toolchain, which is expected to be run on the same machine it is compiled on, and generate code to run on a second machine, the target. - ct-ng calls it "cross". + crosstool-NG calls it "cross". 3) build != host == target Such a toolchain is also a native toolchain, as it targets the same machine as it runs on. But it is build on another machine. You want such a toolchain when porting to a new architecture, or if the build machine is much faster than the host machine. - ct-ng calls it "cross-native". + crosstool-NG calls it "cross-native". 4) build != host != target This one is called a canadian-toolchain (*), and is tricky. The three machines in play are different. You might want such a toolchain if you have a fast build machine, but the users will use it on another machine, and will produce code to run on a third machine. - ct-ng calls it "canadian". + crosstool-NG calls it "canadian". -ct-ng can build all these kinds of toolchains (or is aiming at it, anyway!) +crosstool-NG can build all these kinds of toolchains (or is aiming at it, +anyway!) (*) The term Canadian Cross came about because at the time that these issues were all being hashed out, Canada had three national political parties. diff --git a/kconfig/Makefile b/kconfig/Makefile index 8604b12a..ee71cca9 100644 --- a/kconfig/Makefile +++ b/kconfig/Makefile @@ -1,5 +1,5 @@ # =========================================================================== -# crosstool-ng configuration targets +# crosstool-NG configuration targets # These targets are used from top-level makefile # Derive the project version from, well, the project version: diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh index 4e4f2941..ddb2fb6b 100755 --- a/scripts/crosstool.sh +++ b/scripts/crosstool.sh @@ -39,7 +39,7 @@ CT_EndStep CT_DoLog INFO "Checking environment sanity" # Enable known ordering of files in directory listings: -CT_Test "Crosstool-NG might not work as expected with LANG=\"${LANG}\"" -n "${LANG}" +CT_Test "crosstool-NG might not work as expected with LANG=\"${LANG}\"" -n "${LANG}" case "${LC_COLLATE},${LC_ALL}" in # These four combinations are known to sort files in the correct order: fr_FR*,) ;; diff --git a/scripts/tarball.sh.broken b/scripts/tarball.sh.broken index 8e6c3122..e94ac6e7 100755 --- a/scripts/tarball.sh.broken +++ b/scripts/tarball.sh.broken @@ -52,7 +52,7 @@ CT_BUILD_DIR="${CT_TOP_DIR}/targets/${CT_TARGET}/build" mkdir -p "${CT_BUILD_DIR}" CT_MktempDir tempdir -# Save crosstool-ng, as it is configured for the current toolchain. +# Save crosstool-NG, as it is configured for the current toolchain. topdir=`basename "${CT_TOP_DIR}"` CT_Pushd "${CT_TOP_DIR}/.." @@ -77,7 +77,7 @@ exclude_list="${tempdir}/${CT_TARGET}.list" # Render the install directory writable chmod u+w "${CT_PREFIX_DIR}" -CT_DoLog INFO "Saving crosstool-ng into the toolchain directory" +CT_DoLog INFO "Saving crosstool-NG into the toolchain directory" tar cvjf "${CT_PREFIX_DIR}/${topdir}.${CT_TARGET}.tar.bzip2" \ --no-wildcards-match-slash \ -X "${exclude_list}" \ diff --git a/tools/extractConfig.sh b/tools/extractConfig.sh index 408f69ec..8221d86f 100755 --- a/tools/extractConfig.sh +++ b/tools/extractConfig.sh @@ -1,7 +1,7 @@ #!/bin/sh -# This scripts extracts a crosstool-ng configuration from the log file -# of a toolchain build with crosstool-ng. +# This scripts extracts a crosstool-NG configuration from the log file +# of a toolchain build with crosstool-NG. # Usage: $0