From 6279bec7b709cee2c2d8873d5b114dd1b2752414 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Wed, 1 Aug 2012 12:15:53 +0200 Subject: [PATCH] Remove end-of-line white spaces Signed-off-by: Tobias Ulmer --- INSTALL | 6 +- Makefile | 10 ++-- README.extensions | 4 +- doc/Makefile | 10 ++-- doc/TOOLS | 10 ++-- doc/luadoc/Makefile | 8 +-- doc/man/Makefile | 10 ++-- doc/man/e2-build-numbers.1 | 4 +- doc/man/e2-build.1 | 2 +- doc/man/e2-create-project.1 | 2 +- doc/man/e2-fetch-sources.1 | 2 +- doc/man/e2-install-e2.1 | 4 +- doc/man/e2-new-source.1 | 6 +- doc/man/e2config.5 | 26 ++++----- doc/man/e2global.7 | 4 +- doc/man/e2intro.7 | 2 +- doc/man/e2rc.5 | 2 +- doc/manual/Makefile | 12 ++-- doc/manual/basic-concepts.text | 4 +- doc/manual/buildid.text | 6 +- doc/manual/environment.text | 6 +- doc/manual/licences.text | 2 +- doc/manual/project.text | 2 +- doc/manual/release.text | 2 +- doc/manual/results.text | 9 ++- doc/manual/sources.text | 4 +- example/Makefile | 8 +-- example/example/res/final/build-script | 2 +- example/example/res/helloworld/build-script | 2 +- example/example/src/helloworld/config | 2 +- extensions/Makefile | 10 ++-- generic/Makefile | 8 +-- generic/cache.lua | 24 ++++---- generic/collection.lua | 14 ++--- generic/e2-su-2.2.c | 10 ++-- generic/e2lib.lua | 32 +++++------ generic/e2option.lua | 32 +++++------ generic/e2util.c | 62 ++++++++++----------- generic/lua-version-map.lua.in | 8 +-- generic/luafile.lua | 8 +-- generic/luafile_ll.c | 16 +++--- generic/strict.lua | 10 ++-- generic/transport.lua | 12 ++-- generic/url.lua | 12 ++-- global/Makefile | 8 +-- global/e2-create-project.lua.in | 8 +-- global/e2-fetch-project.lua.in | 8 +-- global/e2-install-e2.lua.in | 8 +-- global/e2-locate-project-root.sh.in | 8 +-- global/e2-root.lua.in | 26 ++++----- global/e2-su.c | 12 ++-- global/e2.lua.in | 14 ++--- global/e2ssh.sh.in | 8 +-- local/Makefile | 10 ++-- local/build-numbers.lua | 8 +-- local/build.lua | 12 ++-- local/cf.lua | 8 +-- local/cvs.lua | 18 +++--- local/dlist.lua | 8 +-- local/dsort.lua | 8 +-- local/e2build.lua | 24 ++++---- local/e2tool.lua | 56 +++++++++---------- local/fetch-sources.lua | 16 +++--- local/files.lua | 22 ++++---- local/git.lua | 26 ++++----- local/linux32.c | 12 ++-- local/ls-project.lua | 10 ++-- local/make/Makefile | 10 ++-- local/make/build.sh | 8 +-- local/make/buildall.sh | 8 +-- local/make/detect_tool | 8 +-- local/make/makefile.collect_project | 8 +-- local/make/makefile.res.template | 8 +-- local/make/makefile.template | 8 +-- local/new-source.lua | 30 +++++----- local/playground.lua | 8 +-- local/policy.lua | 12 ++-- local/svn.lua | 10 ++-- lua/Makefile | 10 ++-- make.vars | 2 +- server-tools/Makefile | 8 +-- server/Makefile | 8 +-- server/web/retrieve-build-numbers.lua.in | 2 +- server/web/store-run-log.lua.in | 2 +- templates/Makefile | 10 ++-- templates/local/build-script | 4 +- templates/local/source.cvs | 2 +- templates/local/source.git | 2 +- templates/local/source.svn | 2 +- test/Makefile | 8 +-- 90 files changed, 473 insertions(+), 474 deletions(-) diff --git a/INSTALL b/INSTALL index 785ba5f..067851f 100644 --- a/INSTALL +++ b/INSTALL @@ -19,9 +19,9 @@ must belong to that group. Create the group. Be sure to add yourself to that group. -e2factory, for historical reasons, builds and installs its own lua. -Make sure you download the lua-5.1.3.tar.gz package and place it in -the top level of the e2factory source tree prior to building. That +e2factory, for historical reasons, builds and installs its own lua. +Make sure you download the lua-5.1.3.tar.gz package and place it in +the top level of the e2factory source tree prior to building. That can be done by creating a symlink. ln -s ../lua-5.1.3.tar.gz diff --git a/Makefile b/Makefile index eab110f..d14021e 100644 --- a/Makefile +++ b/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # @@ -127,7 +127,7 @@ install-doc: done install -m 644 Changelog $(DOCDIR)/ -clean: +clean: for s in $(SUBDIRS) ; do \ $(MAKE) -C $$s $@ ;\ done diff --git a/README.extensions b/README.extensions index 0d19f31..e47c669 100644 --- a/README.extensions +++ b/README.extensions @@ -1,11 +1,11 @@ e2factory has extension support now. -e2factory extensions are simply additional code that is installed in +e2factory extensions are simply additional code that is installed in addition to the e2factory core. extensions can provide a local and a global part. The requirements are - * a git repository, located next to the e2factory core one, if the + * a git repository, located next to the e2factory core one, if the extension should be automatically installed with the local tools * the extensions' Makefile must provide the targets local and install-local to do local install (via e2-install-e2) diff --git a/doc/Makefile b/doc/Makefile index 5665e07..4068e7a 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # @@ -81,7 +81,7 @@ install-doc: $(MAKE) -C $$s $@ ;\ done -clean: +clean: for s in $(SUBDIRS) ; do \ $(MAKE) -C $$s $@ ;\ done diff --git a/doc/TOOLS b/doc/TOOLS index 64bd7a1..ab6a08a 100644 --- a/doc/TOOLS +++ b/doc/TOOLS @@ -46,7 +46,7 @@ and clean up the build directory 2.5 all read the following from stdin chroot path c - build path T + build path T build path in chroot Tc result name r and run all steps required to build without using a chroot environment @@ -57,7 +57,7 @@ and run all steps required to build without using a chroot environment read a result name from stdin print the following to stdout for use as input to most build tools chroot path c - build path T + build path T build path in chroot Tc result name r @@ -109,12 +109,12 @@ if successful print the following to stdout: the absolute path to the projects' bin/ directory 5.3 e2 -e2 is the main script that calls all local tools. e2 refuses to call a +e2 is the main script that calls all local tools. e2 refuses to call a local tool if the cwd is not inside a project directory. Local tools are called from ./bin in the project root unless the E2_LOCAL_TOOL_PATH environment variable is set. -6. Bootstrap process to check out a project and the corresponding +6. Bootstrap process to check out a project and the corresponding version of the e2 tool 6.1 steps @@ -143,5 +143,5 @@ This chapter describes how to make hacking the e2 tool convenient. $ make install-local-symlinks LOCALBINDIR=$PWD/devel use the development tools while testing $ export E2_LOCAL_TOOL_PATH=$PWD/devel - It is possible to edit the local tools in the working copy and immediately + It is possible to edit the local tools in the working copy and immediately use them in any project without performing additional steps ('make install'). diff --git a/doc/luadoc/Makefile b/doc/luadoc/Makefile index a049016..25765e8 100644 --- a/doc/luadoc/Makefile +++ b/doc/luadoc/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/doc/man/Makefile b/doc/man/Makefile index 1f0b3d0..837c163 100644 --- a/doc/man/Makefile +++ b/doc/man/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # @@ -86,7 +86,7 @@ install-doc: doc clean: rm -f $(CLEAN_FILES) rm -fr html man - + %.html: % man2html -r $< >$@ diff --git a/doc/man/e2-build-numbers.1 b/doc/man/e2-build-numbers.1 index 34ab093..f53a24d 100644 --- a/doc/man/e2-build-numbers.1 +++ b/doc/man/e2-build-numbers.1 @@ -16,7 +16,7 @@ build-number for each result. The build-numbers, together with the build-id is stored in the local project-file "proj/build-numbers". The build-number can be manually increased or synchronized with a central server. Build-numbers always strictly increase with each -change. After synchronization, an environment file with suitable +change. After synchronization, an environment file with suitable variable definitions is generated in "proj/build-numbers.env". This file can be included in "proj/env" with the following command: @@ -37,7 +37,7 @@ Normally, exit status is 0. On error, it is non-zero. .BR \-\-no\-sync Do not synchronize with the server, just update local build-number file. .TP -.BR +.BR .BR \-\-prefix=PREFIX Add a user-defined prefix before the local build-numbers. .TP diff --git a/doc/man/e2-build.1 b/doc/man/e2-build.1 index 43c2d7a..ac30f4f 100644 --- a/doc/man/e2-build.1 +++ b/doc/man/e2-build.1 @@ -50,7 +50,7 @@ of whether it is successful or not). Show usage information. .P -Valid build modes according to the builtin policy are +Valid build modes according to the builtin policy are \fBworking-copy\fR, \fBtag\fR, \fBrelease\fR and \fBbranch\fR. \fBtag\fR is the default build mode. \fBrelease\fR is exactly the same as \fBtag\fR but the results will be stored in a special location on the diff --git a/doc/man/e2-create-project.1 b/doc/man/e2-create-project.1 index 3df5387..4723398 100644 --- a/doc/man/e2-create-project.1 +++ b/doc/man/e2-create-project.1 @@ -15,7 +15,7 @@ Create a new project and store it on in . defaults to 'projects'. The project name will be the basename of . The usual project location convention is -\fBprojects:/\fR. +\fBprojects:/\fR. .SH RETURN VALUE Normally, exit status is 0. On error, it is non-zero. diff --git a/doc/man/e2-fetch-sources.1 b/doc/man/e2-fetch-sources.1 index a86e773..b7a1480 100644 --- a/doc/man/e2-fetch-sources.1 +++ b/doc/man/e2-fetch-sources.1 @@ -13,7 +13,7 @@ e2-fetch-sources [OPTION|SOURCE|RESULT ...] .SH DESCRIPTION \fBe2-fetch-sources\fR retrieves sources for project results. Sources can be either specified through the source- or result names. For sources stored -in version-controlled repositories, the associated repositories will be +in version-controlled repositories, the associated repositories will be cloned and a project-local working copy created. Note, that sources of type \fIfiles\fR are not fetched. diff --git a/doc/man/e2-install-e2.1 b/doc/man/e2-install-e2.1 index 6a45066..ff04d6d 100644 --- a/doc/man/e2-install-e2.1 +++ b/doc/man/e2-install-e2.1 @@ -11,7 +11,7 @@ e2-install-e2 \- install the e2 local tools into a project environment e2-install-e2 .SH DESCRIPTION -\fBe2-install-e2\fR reads the required e2 version from the +\fBe2-install-e2\fR reads the required e2 version from the \fB.e2/e2version\fR file and installs that version of e2 into the local project environment. @@ -22,7 +22,7 @@ The \fB.e2/e2version\fR file has a single line with this format: By default the tagged version of e2 is installed. To enable the project developers to follow a stable branch of the -e2 local tools, the tag may be ^ unless a release shall be built. +e2 local tools, the tag may be ^ unless a release shall be built. In this case the HEAD of the branch is installed. In this case the e2 local tools change if commits are done to that branch. diff --git a/doc/man/e2-new-source.1 b/doc/man/e2-new-source.1 index 967ada0..ef1f878 100644 --- a/doc/man/e2-new-source.1 +++ b/doc/man/e2-new-source.1 @@ -22,10 +22,10 @@ cvs and subversion do not support auto-creation of repositories for now. When creating a git repository a server side repository is created and a local repository is created and set up to be related to the server side repository via the remote named origin. -No commits are initially created. The user must create the initial commit +No commits are initially created. The user must create the initial commit and push it to the server. See Examples below. -e2-new-source(1) does not create any configuration files. Use e2-cf(1) to +e2-new-source(1) does not create any configuration files. Use e2-cf(1) to create a source configuration. .SH RETURN VALUE @@ -47,7 +47,7 @@ For further global options, see \fBe2intro\fR(7). .SH EXAMPLES To place an external source file on the default server: .IP -e2-new-source --files a/anything/0.1 file:///tmp/download/anything-0.1.tar.bz2 +e2-new-source --files a/anything/0.1 file:///tmp/download/anything-0.1.tar.bz2 file:///tmp/download/anything-0.1.tar.bz2.sha1 .PP To create a new, empty git repository on server and client side: diff --git a/doc/man/e2config.5 b/doc/man/e2config.5 index 0f64605..6aaa0b5 100644 --- a/doc/man/e2config.5 +++ b/doc/man/e2config.5 @@ -37,10 +37,10 @@ sub-directories: | | |-- build-script build instructions executed in chroot | | o-- project-local files (related to result) |-- results can be grouped in subfolders -| | o-- -| | | |-- config -| | | |-- build-script -| | | o-- +| | o-- +| | | |-- config +| | | |-- build-script +| | | o-- | : | : | @@ -49,9 +49,9 @@ o-- src source descriptions for each source | |-- config source configuration | o-- project-local files (related to source) |-- sources can be groupd in subfolders - | o-- - | | |-- config - | | o-- + | o-- + | | |-- config + | | o-- | : : .fi @@ -72,7 +72,7 @@ env { = "", = "", : -} +} .fi During execution of a build script for a given result, environment variables @@ -190,7 +190,7 @@ file = { location = "", = "contents" } -} +} .fi is one of \fBunpack\fR, \fBpatch\fR or \fBcopy\fR. @@ -212,7 +212,7 @@ e2source { } .fi -If the source refers to a version control repository +If the source refers to a version control repository (\fBgit(7)\fR, \fBsvn(1)\fR, etc.), then these properties should be defined: @@ -236,7 +236,7 @@ module = "" .fi To use cvs pserver mode the server must use "cvspserver://" transport. -cvs login is not supported. Do cvs login before trying to access the +cvs login is not supported. Do cvs login before trying to access the cvs server with e2. Source configuration files must follow \fBlua(1)\fR syntax. @@ -277,12 +277,12 @@ to denote the head revision of the given branch \fIbranchname\fR. .SH RESULT\ CONFIGURATION -"config" files for results look similar to source configurations, but +"config" files for results look similar to source configurations, but use the "e2result" configuration command: .nf e2result { - = , + = , ... } .fi diff --git a/doc/man/e2global.7 b/doc/man/e2global.7 index 133a535..0a32759 100644 --- a/doc/man/e2global.7 +++ b/doc/man/e2global.7 @@ -14,11 +14,11 @@ copy. This interface is versioned using files named \fBversion\fR in the project directory on the server, and \fB.e2/version\fR in the project repository. -These files store integer version ids. They state which version of +These files store integer version ids. They state which version of global code may be used to perform certain tasks on a project. .nf -The interfaces cover: +The interfaces cover: * how to create a project * how to checkout a project from the server * how to install the local e2 tools into a project diff --git a/doc/man/e2intro.7 b/doc/man/e2intro.7 index 3513b9e..9aa1c43 100644 --- a/doc/man/e2intro.7 +++ b/doc/man/e2intro.7 @@ -72,7 +72,7 @@ repository. .TP .BR e2-dlist Shows a sorted list of the dependencies for a given result. -.TP +.TP .BR e2-dsort Shows the sorted list of results in the order in which they must be built to satisfy interdependencies among each result. diff --git a/doc/man/e2rc.5 b/doc/man/e2rc.5 index 05c0594..31d4a3f 100644 --- a/doc/man/e2rc.5 +++ b/doc/man/e2rc.5 @@ -22,7 +22,7 @@ where \fBoption\fR must be the name of a valid command line option and value can be \fBtrue\fR or \fBfalse\fR for flags or a quoted string for options that take an argument. Omitting the value is equivalent to specifying \fBtrue\fR. -Options given on the command line override options specified in +Options given on the command line override options specified in \fBe2rc\fR. Example: diff --git a/doc/manual/Makefile b/doc/manual/Makefile index 8d52015..11cd3db 100644 --- a/doc/manual/Makefile +++ b/doc/manual/Makefile @@ -4,28 +4,28 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -SUBDIRS = +SUBDIRS = TOPLEVEL = ../.. include $(TOPLEVEL)/make.vars @@ -86,7 +86,7 @@ install-doc: $(HTML) cat header.html >$@ markdown $< >>$@ cat footer.html >>$@ - + manual.tar.gz: $(HTML) make DOCDIR=./tmp install-doc cp tmp/manual/manual.html tmp/manual/index.html diff --git a/doc/manual/basic-concepts.text b/doc/manual/basic-concepts.text index 2542756..158bcc8 100644 --- a/doc/manual/basic-concepts.text +++ b/doc/manual/basic-concepts.text @@ -7,7 +7,7 @@ and correct description. But let's have a look step-by-step. Building embedded systems from source usually means taking a lot of steps, building different parts of the system, starting with a toolchain, going -on building the root filesystem and finally creating a flash image, for +on building the root filesystem and finally creating a flash image, for example. You may even want to build an up-to-date set of documentation with the final result. @@ -17,7 +17,7 @@ or more other results, a compiler and assembler and the c library will make up the toolchain while the root filesystem could consist of some libraries, e.g. zlib and the busybox. -Zlib and busybox are usually results again, but they are built from +Zlib and busybox are usually results again, but they are built from sources (that may or may not be named like the results in those cases). Thats basically the whole concept: Configure sources and configure diff --git a/doc/manual/buildid.text b/doc/manual/buildid.text index 6206f5f..bee7188 100644 --- a/doc/manual/buildid.text +++ b/doc/manual/buildid.text @@ -2,15 +2,15 @@ buildid ------- -A buildid is calculated for each result that is built. The buildid, +A buildid is calculated for each result that is built. The buildid, technically being a sha1 hash, identifies all configuration values -that influence the build process. That key is used to store the +that influence the build process. That key is used to store the result. That means, if the user requests building a result, *e2factory* may check if the result already exists and simply skip building it if it does. This feature offers the unique combination of being sure to -build exactly all results that are influenced by changes done to the +build exactly all results that are influenced by changes done to the project configuration or sources. That makes the workflow as easy as just doing changes and requesting diff --git a/doc/manual/environment.text b/doc/manual/environment.text index 98c1184..061c162 100644 --- a/doc/manual/environment.text +++ b/doc/manual/environment.text @@ -6,7 +6,7 @@ Environment as in the build processes. Variables can be published across the whole project or local to a set of -results. In the first case the variables are available in the whole +results. In the first case the variables are available in the whole configuration and in all build processes. They influence all buildids. Publishing variables to a specific set of results will make the variables @@ -22,8 +22,8 @@ with a table argument. The table must have the following structure: The table must hold keys with string values assigned. These key-value pairs are usable in that results configuration and build process. -Calling the env function with a string argument takes that string as a -env file to load in addition to the current configuration file. The +Calling the env function with a string argument takes that string as a +env file to load in addition to the current configuration file. The filename is relative to the project root. Examples: diff --git a/doc/manual/licences.text b/doc/manual/licences.text index 1fc663b..c6861d6 100644 --- a/doc/manual/licences.text +++ b/doc/manual/licences.text @@ -6,7 +6,7 @@ Licences configurations later on. To configure licences call the e2licence function with a table argument. -The table must specify keys with table values. The keys are used as +The table must specify keys with table values. The keys are used as the licence identifier, that can be referenced in source configurations. The table assigns files to the licence: diff --git a/doc/manual/project.text b/doc/manual/project.text index ed1741d..cc87133 100644 --- a/doc/manual/project.text +++ b/doc/manual/project.text @@ -5,7 +5,7 @@ Project *e2factory* needs some configuration information to run, that is collected in the project configuration. -To setup the project configuration call the e2project function with a +To setup the project configuration call the e2project function with a table argument. The table must specify the following keys: diff --git a/doc/manual/release.text b/doc/manual/release.text index cbacff0..8dfd8d5 100644 --- a/doc/manual/release.text +++ b/doc/manual/release.text @@ -5,7 +5,7 @@ Building releases Prepare building a release with *e2factory*: * for each scm source: - * make sure the source is tagged and the tag is configured in the + * make sure the source is tagged and the tag is configured in the source configuration * change the release_id attribute in proj/config to the release string * commit the file diff --git a/doc/manual/results.text b/doc/manual/results.text index d60e917..f4c0c23 100644 --- a/doc/manual/results.text +++ b/doc/manual/results.text @@ -3,7 +3,7 @@ Results To create a result in the configuration call the e2result function -with a table argument. Usually a source configures one or more of the +with a table argument. Usually a source configures one or more of the following keys: * sources list of sources @@ -28,11 +28,11 @@ separated with a dot (e.g. xorg.libXau). This occurrs when specify dependencies The `collect_project` flag provides a tree holding everything to rebuild the result configured in `collect_project_default_result` in $E2_TMPDIR/project. -The user must write a build-script to package that tree to a file in +The user must write a build-script to package that tree to a file in $E2_TMPDIR/out -All configuration options can be combined. And even a configuration with -no keys is valid: The `base` chroot group is used automatically, and the +All configuration options can be combined. And even a configuration with +no keys is valid: The `base` chroot group is used automatically, and the `build-script` runs and may create a result. Example configuration: @@ -60,7 +60,6 @@ Example (using the `collect_project` flag) collect_project_default_result = "bsp", sources = { }, depends = { }, - } Example build script: diff --git a/doc/manual/sources.text b/doc/manual/sources.text index eee5f67..26eb139 100644 --- a/doc/manual/sources.text +++ b/doc/manual/sources.text @@ -21,7 +21,7 @@ files source (type = files, default) * location (old: name) string: file location * unpack string: the directory included in the source package * patch string: strip n directories when - * copy string: the directory to copy the file into, relative to + * copy string: the directory to copy the file into, relative to Example: @@ -37,7 +37,7 @@ Example: sha1 = "60faeaaf250642db5c0ea36cd6dcc9f99c8f3902", }, } - } + } cvs source (type = cvs) diff --git a/example/Makefile b/example/Makefile index 52b1671..f0875b6 100644 --- a/example/Makefile +++ b/example/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/example/example/res/final/build-script b/example/example/res/final/build-script index 664e9bb..6b6d5e4 100644 --- a/example/example/res/final/build-script +++ b/example/example/res/final/build-script @@ -15,7 +15,7 @@ # installing software for packaging # ./env files containing environment variables are located here # ./init init scripts are located here -# ./script this directory holds the build driver and the build +# ./script this directory holds the build driver and the build # script # ./in This directory is available but unused # ./dep/ These directories hold result files from dependency diff --git a/example/example/res/helloworld/build-script b/example/example/res/helloworld/build-script index d0dd7a1..5f3a29a 100644 --- a/example/example/res/helloworld/build-script +++ b/example/example/res/helloworld/build-script @@ -15,7 +15,7 @@ # installing software for packaging # ./env files containing environment variables are located here # ./init init scripts are located here -# ./script this directory holds the build driver and the build +# ./script this directory holds the build driver and the build # script # ./in This directory is available but unused # ./dep/ These directories hold result files from dependency diff --git a/example/example/src/helloworld/config b/example/example/src/helloworld/config index 27d5c7e..8e7e5a5 100644 --- a/example/example/src/helloworld/config +++ b/example/example/src/helloworld/config @@ -2,7 +2,7 @@ e2source { -- the source name - -- (is derived from the config file path if only one source is + -- (is derived from the config file path if only one source is -- specified per file) name = "helloworld", -- the source type diff --git a/extensions/Makefile b/extensions/Makefile index 698f1d6..8dd857c 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # @@ -58,4 +58,4 @@ clean: @for s in $(SUBDIRS) ; do $(MAKE) -C $$s $@ ; done rm -f $(CLEAN_FILES) -.PHONY: all install local install-local doc install-doc clean +.PHONY: all install local install-local doc install-doc clean diff --git a/generic/Makefile b/generic/Makefile index 0f7f581..144c60a 100644 --- a/generic/Makefile +++ b/generic/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/generic/cache.lua b/generic/cache.lua index 8827cde..da449ed 100644 --- a/generic/cache.lua +++ b/generic/cache.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -64,7 +64,7 @@ function new_cache(name, url) c.ce = {} e2lib.log(4, "Cache: " .. c.name) e2lib.log(4, " url: " .. c.url) - if debug then + if debug then for k,v in pairs(c) do print(k,v) end @@ -295,8 +295,8 @@ end -- @return bool -- @return an error object on failure function fetch_file(cache, server, location, destdir, destname, flags) - e2lib.log(4, string.format("%s: %s, %s, %s, %s, %s", "fetch_file()", - tostring(server), tostring(location), tostring(destdir), + e2lib.log(4, string.format("%s: %s, %s, %s, %s, %s", "fetch_file()", + tostring(server), tostring(location), tostring(destdir), tostring(destname), tostring(flags))) local rc, re local e = new_error("cache: fetching file failed") @@ -350,7 +350,7 @@ end function push_file(cache, sourcefile, server, location, flags) local rc, re local e = new_error("error pushing file to cache/server") - e2lib.log(4, string.format("%s: %s, %s, %s", "push_file()", + e2lib.log(4, string.format("%s: %s, %s, %s", "push_file()", sourcefile, server, location)) local ce, re = ce_by_server(cache, server) if not ce then @@ -389,7 +389,7 @@ end -- @return bool -- @return an error object on failure function writeback(cache, server, location, flags) - e2lib.log(4, string.format("writeback(): %s %s %s", cache.name, + e2lib.log(4, string.format("writeback(): %s %s %s", cache.name, server, location)) local e = new_error("writeback failed") local rc, re @@ -423,7 +423,7 @@ end -- @return an error object on failure function cache_file(cache, server, location, flags) e2lib.log(4, string.format("cache_file(): %s %s %s %s", - tostring(cache), tostring(server), tostring(location), + tostring(cache), tostring(server), tostring(location), tostring(flags))) local e = new_error("caching file failed: %s:%s", server, location) local rc, re @@ -447,7 +447,7 @@ function cache_file(cache, server, location, flags) -- file is in the cache and no refresh requested return true, nil end - local destdir = string.format("/%s/%s", ceurl.path, + local destdir = string.format("/%s/%s", ceurl.path, e2lib.dirname(location)) -- fetch the file to the cache rc, re = transport.fetch_file(ce.remote_url, location, destdir, nil) @@ -465,7 +465,7 @@ end -- @return string the path to the cached file, nil on error -- @return an error object on failure function file_path(cache, server, location, flags) - e2lib.log(4, string.format("file_path(): %s %s %s", + e2lib.log(4, string.format("file_path(): %s %s %s", cache.name, server, location)) local rc, re local e = new_error("providing file path failed") diff --git a/generic/collection.lua b/generic/collection.lua index 693f7a9..e0d30a7 100644 --- a/generic/collection.lua +++ b/generic/collection.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -65,7 +65,7 @@ end -- Table operations -- -- table.reverse(TABLE) -> TABLE' --- +-- -- Reverse array elements and return new table. -- -- table.map(TABLE, FUNCTION) -> TABLE' @@ -122,8 +122,8 @@ function table.filter(t, f) local t2 = {} local i = 1 for k, x in pairs(t) do - if f(x) then - t2[ i ] = x + if f(x) then + t2[ i ] = x i = i + 1 end end diff --git a/generic/e2-su-2.2.c b/generic/e2-su-2.2.c index d149f50..95a450e 100644 --- a/generic/e2-su-2.2.c +++ b/generic/e2-su-2.2.c @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -32,7 +32,7 @@ * * This layout is broken: the chroot marker file can be deleted in chroot * and early when removing chroot is not fully done. - * In that case e2factory refuses to use and even delete the chroot + * In that case e2factory refuses to use and even delete the chroot * environment, leaving the user with a chroot environment that only * root may delete. * diff --git a/generic/e2lib.lua b/generic/e2lib.lua index 5d17eed..7f66632 100644 --- a/generic/e2lib.lua +++ b/generic/e2lib.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -35,7 +35,7 @@ require("tools") require("cache") require("luafile") -_version = "e2factory, the emlix embedded build system, version " .. +_version = "e2factory, the emlix embedded build system, version " .. buildconfig.VERSION _licence = [[ @@ -70,12 +70,12 @@ globals = { { "v4", false } -- tooldebug }, log_debug = false, - debug = false, + debug = false, playground = false, interactive = arg and (arg[ -1 ] == "-i"), -- variables initialized in init() - username = nil, - homedir = nil, + username = nil, + homedir = nil, hostname = nil, termwidth = 72, env = {}, @@ -388,7 +388,7 @@ function warnf(category, format, ...) return nil end ---- exit, cleaning up temporary files and directories. +--- exit, cleaning up temporary files and directories. -- Return code is '1' and cannot be overrided. -- This function takes any number of strings or an error object as arguments. -- Please pass error objects to this function in the future. @@ -798,7 +798,7 @@ function read_configuration(p) local function nextline(s) while true do local ln = s:read("*l") - if not ln then + if not ln then s:close() return nil elseif not string.find(ln, "^%s*#") and string.find(ln, "%S") then @@ -1000,7 +1000,7 @@ end -- compute_hash(ITER, [VALUE...]) function compute_hash(iter, ...) - local n, f, s + local n, f, s local i, o, e, p = e2util.pipe("sha1sum") if not i then bomb("cannot calculate hash sum: " .. o) end for x in iter(...) do @@ -1015,7 +1015,7 @@ function compute_hash(iter, ...) if not n then bomb(f) end n, f = e2util.wait(p) if not n then bomb(f) end - return s + return s end -- Iterator functions @@ -1052,8 +1052,8 @@ function callcmd(infile, outfile, errfile, cmd) return (rc/256) end --- callcmd_redirect: call a command with --- stdin redirected from /dev/null +-- callcmd_redirect: call a command with +-- stdin redirected from /dev/null -- stdout/stderr redirected to a luafile object function callcmd_redirect(cmd, out) @@ -1150,7 +1150,7 @@ function callcmd_pipe(cmds, infile, outfile) .. table.concat(rcs, ", ") end ---- call a command with stdin redirected from /dev/null, stdout/stderr +--- call a command with stdin redirected from /dev/null, stdout/stderr -- captured via a pipe -- the capture function is called for every chunk of output that -- is captured from the pipe. @@ -1732,7 +1732,7 @@ function isdir(dir) local args = string.format("-d '%s'", dir) return call_tool("test", args) end - + --- check if path is a file -- @param dir string: path -- @return bool diff --git a/generic/e2option.lua b/generic/e2option.lua index 982d190..c616b32 100644 --- a/generic/e2option.lua +++ b/generic/e2option.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -55,7 +55,7 @@ local program_name = arg[ 0 ] -- option(NAME, [DOC, [DEFAULT, [FUNCTION, [ARGUMENTNAME]]]]) -- -- Declares an option with argument. DEFAULT defaults to "true". --- ARGUMENTNAME will be used in the generated usage information +-- ARGUMENTNAME will be used in the generated usage information -- (see "usage()"). -- -- alias(NAME, OPTION) @@ -93,7 +93,7 @@ function option(name, doc, default, func, argname) return false, new_error("option exists: %s", name) end options[ name ] = {type = "option", documentation = doc or "", name = name, - proc=func, default=default or true, + proc=func, default=default or true, argumentname=argname or "ARGUMENT"} table.insert(optionlist, name) end @@ -259,7 +259,7 @@ function parse(args) return end local e2rc = {} - local rc, e = e2lib.dofile_protected(file, + local rc, e = e2lib.dofile_protected(file, { e2rc = function(t) e2rc = t end }) if not rc then e2lib.abort(e) @@ -286,18 +286,18 @@ function parse(args) local vals = {} local opts={ arguments=vals } local i = 1 - while i <= #args do -- we may modify args + while i <= #args do -- we may modify args local v = args[ i ] local s, e, opt, val = string.find(v, "^%-%-?([^= ]+)=(.*)$") if s then opt = aliases[ opt ] or opt - if options[ opt ] then + if options[ opt ] then local proc = options[ opt ].proc if proc then val = proc(val) end opts[ opt ] = val else usage(1) end - else + else s, e, opt = string.find(v, "^%-%-?(.*)$") if s then opt = aliases[ opt ] or opt @@ -307,16 +307,16 @@ function parse(args) if i == #args then e2lib.abort("argument missing for option: " .. opt) end - if proc then + if proc then opts[ opt ] = proc(args[ i + 1 ]) - else + else opts[ opt ] = args[ i + 1 ] end i = i + 1 else - if proc then + if proc then opts[ opt ] = proc() - else + else opts[ opt ] = options[ opt ].default end end @@ -365,8 +365,8 @@ function usage(rc) Copyright (C) 2007-2009 by Gordon Hecker and Oskar Schirmer, emlix GmbH Copyright (C) 2007-2008 by Felix Winkelmann, emlix GmbH -This program comes with ABSOLUTELY NO WARRANTY; This is free software, -and you are welcome to redistribute it under certain conditions. +This program comes with ABSOLUTELY NO WARRANTY; This is free software, +and you are welcome to redistribute it under certain conditions. Type e2 --licence for more information. ]]) print(documentation) diff --git a/generic/e2util.c b/generic/e2util.c index d3c99b0..8a3076a 100644 --- a/generic/e2util.c +++ b/generic/e2util.c @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -51,7 +51,7 @@ static char buffer[ PATH_MAX + 1 ]; -/* e2util.fork() -> pid +/* e2util.fork() -> pid | nil, ERRORMESSAGE Forks a subprocess. @@ -75,8 +75,8 @@ lua_fork(lua_State *lua) } -/* e2util.cwd() -> STRING - +/* e2util.cwd() -> STRING + Returns the current working directory. */ @@ -92,8 +92,8 @@ get_working_directory(lua_State *lua) } -/* e2util.realpath(PATH) -> PATH' | nil - +/* e2util.realpath(PATH) -> PATH' | nil + If PATH names an existing object in the file-system, then this function will return the absolute, canonical representation of PATH, otherwise nil is returned. @@ -111,8 +111,8 @@ get_realpath(lua_State *lua) } -/* e2util.stat(PATH, [FOLLOWLINKS?]) -> TABLE | nil - +/* e2util.stat(PATH, [FOLLOWLINKS?]) -> TABLE | nil + Returns stat(3) information for the file system object designated by PATH. If FOLLOWLINKS? is not given or false, then the returned information will apply to the actual symbolic link, if PATH designates one. Otherwise @@ -134,7 +134,7 @@ get_realpath(lua_State *lua) blocks number of blocks (number) type one of the following strings: - + block-special character-special fifo-special @@ -223,7 +223,7 @@ get_file_statistics(lua_State *lua) } -/* e2util.readlink(PATH) -> PATH' | nil +/* e2util.readlink(PATH) -> PATH' | nil Returns the path pointed to by the symbolic link PATH or nil, if the link does not exist. @@ -236,7 +236,7 @@ read_symbolic_link(lua_State *lua) int len; len = readlink(p, buffer, sizeof(buffer)); - + if(len > -1) lua_pushlstring(lua, buffer, len); else lua_pushnil(lua); @@ -244,7 +244,7 @@ read_symbolic_link(lua_State *lua) } -/* e2util.directory(PATH, [DOTFILES?]) -> TABLE | nil +/* e2util.directory(PATH, [DOTFILES?]) -> TABLE | nil Returns an array with the contents of the directory designated by PATH. If DOTFILES? is given and true then files beginning with "." are also @@ -266,7 +266,7 @@ get_directory(lua_State *lua) lua_newtable(lua); for(;;) { - de = readdir(dir); + de = readdir(dir); if(de == NULL) break; @@ -278,12 +278,12 @@ get_directory(lua_State *lua) closedir(dir); } - + return 1; } -/* e2util.tempnam(DIR) -> PATH +/* e2util.tempnam(DIR) -> PATH Returns a random temporary pathname. */ @@ -297,7 +297,7 @@ create_temporary_filename(lua_State *lua) } -/* e2util.exists(PATH, [EXECUTABLE?]) -> BOOL +/* e2util.exists(PATH, [EXECUTABLE?]) -> BOOL Returns true if the file given in PATH exists. If EXECUTABLE? is given and true, then it is also checked whether the file is executable. @@ -316,7 +316,7 @@ file_exists(lua_State *lua) } -/* e2util.cd(PATH) +/* e2util.cd(PATH) Changes the current working directory to PATH. */ @@ -339,7 +339,7 @@ change_directory(lua_State *lua) return 2; } -/* e2util.symlink(OLDPATH, NEWPATH) +/* e2util.symlink(OLDPATH, NEWPATH) Creates a symbolic link named NEWPATH which contains the string OLDPATH. */ @@ -398,21 +398,21 @@ run_pipe(lua_State *lua) } else if(child == 0) { close(in[ 1 ]); - + if(in[ 0 ] != STDIN_FILENO) { dup2(in[ 0 ], STDIN_FILENO); close(in[ 0 ]); } close(out[ 0 ]); - + if(out[ 1 ] != STDOUT_FILENO) { dup2(out[ 1 ], STDOUT_FILENO); close(out[ 1 ]); } close(err[ 0 ]); - + if(err[ 1 ] != STDERR_FILENO) { dup2(err[ 1 ], STDERR_FILENO); close(err[ 1 ]); @@ -450,10 +450,10 @@ run_pipe(lua_State *lua) /* e2util.wait(PID) -> STATUS, PID | nil, ERRORMESSAGE - waits for process to terminate and returns exit code. + waits for process to terminate and returns exit code. */ -static int +static int process_wait(lua_State *lua) { pid_t pid = luaL_checkinteger(lua, 1); @@ -485,7 +485,7 @@ read_fd(lua_State *lua) int m; if(buf == NULL) return 0; - + m = read(fd, buf, n); if(m < 0) { @@ -540,7 +540,7 @@ static int close_fd(lua_State *lua) { int fd = luaL_checkinteger(lua, 1); - + if(close(fd) < 0) { lua_pushnil(lua); lua_pushstring(lua, (char *)strerror(errno)); @@ -710,7 +710,7 @@ do_getpid(lua_State *lua) { Establish signal handler for SIGINT that aborts. */ -static void +static void lstop(lua_State *L, lua_Debug *ar) { lua_sethook(L, NULL, 0, 0); lua_getglobal(L, "e2lib"); @@ -722,7 +722,7 @@ lstop(lua_State *L, lua_Debug *ar) { static lua_State *globalL; -static void +static void laction (int i) { signal(i, SIG_DFL); /* if another SIGINT happens before lstop, terminate process (default action) */ @@ -762,6 +762,6 @@ int luaopen_e2util(lua_State *lua) { luaL_register(lua, "e2util", lib); globalL = lua; - signal(SIGINT, laction); + signal(SIGINT, laction); return 1; } diff --git a/generic/lua-version-map.lua.in b/generic/lua-version-map.lua.in index 07551a6..049557c 100644 --- a/generic/lua-version-map.lua.in +++ b/generic/lua-version-map.lua.in @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] diff --git a/generic/luafile.lua b/generic/luafile.lua index 92247a3..da5820b 100644 --- a/generic/luafile.lua +++ b/generic/luafile.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] diff --git a/generic/luafile_ll.c b/generic/luafile_ll.c index 7b243cf..fdc5667 100644 --- a/generic/luafile_ll.c +++ b/generic/luafile_ll.c @@ -4,28 +4,28 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* +/* Low-level file-system and process operations. */ @@ -38,7 +38,7 @@ #include #include -static int +static int lua_fopen(lua_State *lua) { FILE *f; @@ -69,7 +69,7 @@ lua_fclose(lua_State *lua) return 1; } -static int +static int lua_fdopen(lua_State *lua) { FILE *f; @@ -223,7 +223,7 @@ lua_setlinebuf(lua_State *lua) if(!f) { lua_pushboolean(lua, 0); return 1; - } + } setlinebuf(f); lua_pushboolean(lua, 1); return 1; diff --git a/generic/strict.lua b/generic/strict.lua index ffbb5f8..6ddbcd7 100644 --- a/generic/strict.lua +++ b/generic/strict.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -54,7 +54,7 @@ mt.__newindex = function (t, n, v) end rawset(t, n, v) end - + mt.__index = function (t, n) if not mt.__declared[n] and what() ~= "C" then error("variable '"..n.."' is not declared", 2) diff --git a/generic/transport.lua b/generic/transport.lua index f929f87..2c95a8c 100644 --- a/generic/transport.lua +++ b/generic/transport.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -133,7 +133,7 @@ end -- @return true on success, false on error -- @return an error object on failure function fetch_file(surl, location, destdir, destname) - e2lib.log(4, string.format("%s: %s %s %s", "fetch_file()", surl, + e2lib.log(4, string.format("%s: %s %s %s", "fetch_file()", surl, location, destdir)) if not destname then destname = e2lib.basename(location) @@ -342,7 +342,7 @@ end -- @return true on success, false on error -- @return nil, an error string on error function file_path(surl, location) - e2lib.log(4, string.format("%s: %s %s", "file_path()", surl, + e2lib.log(4, string.format("%s: %s %s", "file_path()", surl, location)) local e = new_error("can't get path to file") local u, re = url.parse(surl) diff --git a/generic/url.lua b/generic/url.lua index 90651f5..52aae4d 100644 --- a/generic/url.lua +++ b/generic/url.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -49,7 +49,7 @@ function parse(url) end u.url = url -- parse: transport://server/path - u.transport, u.server, u.path = + u.transport, u.server, u.path = u.url:match("(%S+)://([^/]*)(.*)") if not u.transport then return nil, string.format("can't parse url: %s", url) @@ -59,7 +59,7 @@ function parse(url) -- parse the server part if u.server:match("(%S+):(%S+)@(%S+)") then -- user:pass@host - u.user, u.pass, u.servername = + u.user, u.pass, u.servername = u.server:match("(%S+):(%S+)@(%S+)") elseif u.server:match("(%S+)@(%S+)") then -- user@host diff --git a/global/Makefile b/global/Makefile index 0b66eeb..4ab595d 100644 --- a/global/Makefile +++ b/global/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/global/e2-create-project.lua.in b/global/e2-create-project.lua.in index 0343efc..2903f75 100755 --- a/global/e2-create-project.lua.in +++ b/global/e2-create-project.lua.in @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] diff --git a/global/e2-fetch-project.lua.in b/global/e2-fetch-project.lua.in index e9c6e69..918efc8 100755 --- a/global/e2-fetch-project.lua.in +++ b/global/e2-fetch-project.lua.in @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] diff --git a/global/e2-install-e2.lua.in b/global/e2-install-e2.lua.in index 154720a..54f66d5 100755 --- a/global/e2-install-e2.lua.in +++ b/global/e2-install-e2.lua.in @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] diff --git a/global/e2-locate-project-root.sh.in b/global/e2-locate-project-root.sh.in index 7be2cfc..d6fecc0 100755 --- a/global/e2-locate-project-root.sh.in +++ b/global/e2-locate-project-root.sh.in @@ -5,23 +5,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/global/e2-root.lua.in b/global/e2-root.lua.in index e9d6414..ba7fe73 100755 --- a/global/e2-root.lua.in +++ b/global/e2-root.lua.in @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -57,7 +57,7 @@ if arg[1] == "chroot_2_2" then os.exit(99) end assert_chroot_environment(path) - local cmd = string.format("%s -i %s '%s' %s", env_tool, chroot_tool, path, + local cmd = string.format("%s -i %s '%s' %s", env_tool, chroot_tool, path, command) local rc = os.execute(cmd) os.exit(rc/256) @@ -78,7 +78,7 @@ elseif arg[1] == "extract_tar_2_2" then elseif tartype == "tar" then tarflags = "" end - local cmd = string.format("%s -i %s %s -C '%s' -xf '%s'", + local cmd = string.format("%s -i %s %s -C '%s' -xf '%s'", env_tool, tar_tool, tarflags, path, file) local rc = os.execute(cmd) os.exit(rc/256) @@ -90,7 +90,7 @@ elseif arg[1] == "set_permissions_2_2" then os.exit(99) end assert_chroot_environment(path) - local cmd = string.format("%s -i %s root:root '%s'", env_tool, chown_tool, + local cmd = string.format("%s -i %s root:root '%s'", env_tool, chown_tool, path) local rc = os.execute(cmd) os.exit(rc/256) @@ -129,12 +129,12 @@ call.cmd = arg[1] call.tmpdir = arg[2] .. "/e2build" call.proj = arg[3] call.result = arg[4] -call.chroot_path = call.tmpdir .. "/" .. call.username .. "/" .. +call.chroot_path = call.tmpdir .. "/" .. call.username .. "/" .. call.proj .. "/" .. call.result .. "/chroot" local rc = 1 if call.cmd == "setup-chroot" then - rc = os.execute("mkdir -p " .. call.chroot_path .. + rc = os.execute("mkdir -p " .. call.chroot_path .. " && touch \"" .. call.chroot_path .. "/emlix-chroot\"") os.exit(rc/256) @@ -146,12 +146,12 @@ elseif call.cmd == "extract-tar" then elseif string.match(call.file, ".tar$") then opts = "-xf" end - rc = os.execute("tar -C \"" .. call.chroot_path .. + rc = os.execute("tar -C \"" .. call.chroot_path .. "\" " .. opts .. " \"" .. call.file .. "\"") os.exit(rc/256) elseif call.cmd == "prepare" then - rc = os.execute("PATH=/usr/sbin:/sbin:$PATH " .. + rc = os.execute("PATH=/usr/sbin:/sbin:$PATH " .. "T=\"/tmp/e2\" " .. "r=\"" .. call.result .. "\" " .. "chroot " .. call.chroot_path .. " " .. @@ -159,7 +159,7 @@ elseif call.cmd == "prepare" then os.exit(rc/256) elseif call.cmd == "runbuild" then - rc = os.execute("PATH=/usr/sbin:/sbin:$PATH " .. + rc = os.execute("PATH=/usr/sbin:/sbin:$PATH " .. "T=\"/tmp/e2\" " .. "r=\"" .. call.result .. "\" " .. "chroot " .. call.chroot_path .. " " .. @@ -173,7 +173,7 @@ elseif call.cmd == "enter" then else command = "" end - rc = os.execute("PATH=/usr/sbin:/sbin:$PATH " .. + rc = os.execute("PATH=/usr/sbin:/sbin:$PATH " .. "T=\"/tmp/e2\" " .. "r=\"" .. call.result .. "\" " .. "chroot " .. call.chroot_path .. " " .. diff --git a/global/e2-su.c b/global/e2-su.c index 824aacd..2453b44 100644 --- a/global/e2-su.c +++ b/global/e2-su.c @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -40,7 +40,7 @@ #define E2_ROOT_TOOL_NAME "e2-root" #endif #ifndef E2_ROOT_TOOL_PATH -#define E2_ROOT_TOOL_PATH TOOLDIR "/" E2_ROOT_TOOL_NAME +#define E2_ROOT_TOOL_PATH TOOLDIR "/" E2_ROOT_TOOL_NAME #endif char *tool_name = E2_ROOT_TOOL_NAME; @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) arg[k] = NULL; if(getenv("DEBUG")) { - printf("%s\n", E2_ROOT_TOOL_PATH); + printf("%s\n", E2_ROOT_TOOL_PATH); for(i=0; arg[i]; i++) { printf("\"%s\"\n", arg[i]); } diff --git a/global/e2.lua.in b/global/e2.lua.in index 8e180ac..da412af 100755 --- a/global/e2.lua.in +++ b/global/e2.lua.in @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -76,7 +76,7 @@ else end e2call.globaltool = buildconfig.TOOLDIR .. "/" .. e2call.toolname -if root then +if root then e2call.localtool = root .. "/.e2/bin/" .. e2call.toolname end @@ -88,7 +88,7 @@ if e2util.stat(e2call.globaltool) then lua = buildconfig.LUA cmd = string.format("%s %s %s %s", env, lua, e2call.tool, e2call.arg_string) elseif not root then - e2lib.abort(e2call.toolname .. + e2lib.abort(e2call.toolname .. " is not a global tool and we're not in a project environment") elseif root and e2util.stat(e2call.localtool) then e2call.tool = e2call.localtool @@ -96,7 +96,7 @@ elseif root and e2util.stat(e2call.localtool) then root .. "/.e2/lib/e2/?.lua' " .. "LUA_CPATH=" .. root .. "/.e2/lib/e2/?.so" cmd = env .. " " .. - root .. "/.e2/bin/e2-lua " .. + root .. "/.e2/bin/e2-lua " .. e2call.tool .. " " .. e2call.arg_string else e2lib.abort(e2call.toolname .. " is neither local nor global tool") diff --git a/global/e2ssh.sh.in b/global/e2ssh.sh.in index 4ea99ca..5434be3 100755 --- a/global/e2ssh.sh.in +++ b/global/e2ssh.sh.in @@ -5,23 +5,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/local/Makefile b/local/Makefile index 27515bc..2759212 100644 --- a/local/Makefile +++ b/local/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # @@ -37,7 +37,7 @@ VPATH = .:$(TOPLEVEL)/generic:$(TOPLEVEL) CLEAN_FILES = *~ *.so linux32 *.lc *.o CFLAGS += -I. -I$(DESTDIR)$(INCDIR) -I$(DESTDIR)$(INCDIR)/lua-$(LUA_VERSION) \ -I../lua/lua-$(LUA_VERSION)/src -fPIC -LDFLAGS += -L. -L../lua/lua-$(LUA_VERSION)/src -Wl,-R$(LIBDIR) +LDFLAGS += -L. -L../lua/lua-$(LUA_VERSION)/src -Wl,-R$(LIBDIR) LOCALLUATOOLS = \ build dlist dsort fetch-sources new-source ls-project \ playground build-numbers cf diff --git a/local/build-numbers.lua b/local/build-numbers.lua index 944b744..2c67265 100755 --- a/local/build-numbers.lua +++ b/local/build-numbers.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] diff --git a/local/build.lua b/local/build.lua index dcba761..c05633e 100755 --- a/local/build.lua +++ b/local/build.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -142,7 +142,7 @@ if playground then if opts.release then e2lib.abort("--release and --playground are mutually exclusive") end - if opts.all then + if opts.all then e2lib.abort("--all and --playground are mutually exclusive") end if #opts.arguments ~= 1 then @@ -161,7 +161,7 @@ if not rc then end -- a list of results to build, topologically sorted -local sel_res = {} +local sel_res = {} if #results > 0 then local re sel_res, re = e2tool.dlist_recursive(info, results) diff --git a/local/cf.lua b/local/cf.lua index 1fbefc9..073e684 100755 --- a/local/cf.lua +++ b/local/cf.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] diff --git a/local/cvs.lua b/local/cvs.lua index 3301e46..415a05b 100644 --- a/local/cvs.lua +++ b/local/cvs.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -59,7 +59,7 @@ function cvs.validate_source(info, sourcename) end if not src.cvsroot then e2lib.warnf("WDEFAULT", "in source %s:", sourcename) - e2lib.warnf("WDEFAULT", + e2lib.warnf("WDEFAULT", " source has no `cvsroot' attribute, defaulting to the server path") src.cvsroot = "." end @@ -312,12 +312,12 @@ function cvs.sourceid(info, sourcename, source_set) if src.sourceid[source_set] then return true, nil, src.sourceid[source_set] end - local e = new_error("calculating sourceid failed for source %s", + local e = new_error("calculating sourceid failed for source %s", sourcename) local hc = hash.hash_start() hash.hash_line(hc, src.name) hash.hash_line(hc, src.type) - hash.hash_line(hc, src._env:id()) + hash.hash_line(hc, src._env:id()) for _,l in ipairs(src.licences) do hash.hash_line(hc, l) local licenceid, re = e2tool.licenceid(info, l) @@ -331,8 +331,8 @@ function cvs.sourceid(info, sourcename, source_set) -- we rely on tags being unique with cvs hc:hash_line(src.tag) else - -- the old function took a hash of the CVS/Entries file, but - -- forgot the subdirecties' CVS/Entries files. We might + -- the old function took a hash of the CVS/Entries file, but + -- forgot the subdirecties' CVS/Entries files. We might -- reimplement that once... e:append("cannot calculate sourceid for source set %s", source_set) diff --git a/local/dlist.lua b/local/dlist.lua index 8f19919..a6a2dd2 100755 --- a/local/dlist.lua +++ b/local/dlist.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] diff --git a/local/dsort.lua b/local/dsort.lua index 1bb4d5b..7585bdd 100755 --- a/local/dsort.lua +++ b/local/dsort.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] diff --git a/local/e2build.lua b/local/e2build.lua index a1a1881..43c6fd6 100644 --- a/local/e2build.lua +++ b/local/e2build.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -305,7 +305,7 @@ function enter_playground(info, r, chroot_command) local term = e2lib.globals.terminal local e2_su = tools.get_tool("e2-su-2.2") local cmd = string.format("%s %s chroot_2_3 '%s' %s", - res.build_config.chroot_call_prefix, e2_su, + res.build_config.chroot_call_prefix, e2_su, res.build_config.base, chroot_command) e2tool.set_umask(info) os.execute(cmd) @@ -519,7 +519,7 @@ function sources(info, r, return_flags) local function append_to_build_driver(info, r, script) local res = info.results[r] - res.build_config.build_driver = + res.build_config.build_driver = res.build_config.build_driver .. string.format("%s\n", script) end @@ -667,7 +667,7 @@ function linklast(info, r, return_flags) -- calculate the path to the result local server, location = res.build_mode.storage(info.project_location, info.release_id) - local location1 = string.format("%s/%s/%s", location, r, + local location1 = string.format("%s/%s/%s", location, r, res.build_mode.buildid(res.buildid)) local cache_flags = { check_only = true @@ -966,7 +966,7 @@ end -- skip results that depend on this result -- example: toolchain, busybox, sources, iso, -- sources being the result collecting the project: --- the results sources and iso won't be included, as that would lead to +-- the results sources and iso won't be included, as that would lead to -- an impossibility to calculate buildids (infinite recursion) -- @param c table: build context -- @return bool @@ -981,7 +981,7 @@ function collect_project(info, r, return_flags) local rc, re local e = new_error("providing project data to this build failed") -- project/proj/init/ - local destdir = string.format("%s/project/proj/init", + local destdir = string.format("%s/project/proj/init", res.build_config.T) e2lib.mkdir(destdir, "-p") local init_files = e2util.directory(info.root .. "/proj/init") @@ -1020,7 +1020,7 @@ function collect_project(info, r, return_flags) for _,g in pairs(res.collect_project_chroot_groups) do e2lib.log(3, string.format("chroot group: %s", g)) local grp = info.chroot.groups_byname[g] - local destdir = string.format("%s/project/chroot/%s", + local destdir = string.format("%s/project/chroot/%s", res.build_config.T, g) e2lib.mkdir(destdir, "-p") local makefile, msg = io.open( @@ -1095,7 +1095,7 @@ function collect_project(info, r, return_flags) if not rc then return false, e:cat(re) end - local destdir = string.format("%s/project/%s", + local destdir = string.format("%s/project/%s", res.build_config.T, e2tool.resultdir(n)) e2lib.mkdir(destdir, "-p") -- copy files @@ -1150,7 +1150,7 @@ function collect_project(info, r, return_flags) for _,s in ipairs(info.results[r].collect_project_sources) do local src = info.sources[s] e2lib.log(3, string.format("source: %s", s)) - local destdir = string.format("%s/project/%s", + local destdir = string.format("%s/project/%s", res.build_config.T, e2tool.sourcedir(s)) e2lib.mkdir(destdir, "-p") local source_set = res.build_mode.source_set() diff --git a/local/e2tool.lua b/local/e2tool.lua index 79df94e..bfe05b9 100644 --- a/local/e2tool.lua +++ b/local/e2tool.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -101,7 +101,7 @@ require("policy") -- @field branch string: branch name -- @field tag table: table of tag names (strings) -- @field file table: table of file records (tables) --- @field fhash string: hash value for this source, for use in buildid +-- @field fhash string: hash value for this source, for use in buildid -- calculation -- @field flist table: array of files -- (deprecated, replaced by file records) @@ -121,7 +121,7 @@ require("policy") -- @field depends table of strings: list of dependencies -- @field chroot table of strings: list of chroot groups to use -- @field collect_project bool: collect the project structure into this result? --- @field collect_project_default_result string: which result shall be +-- @field collect_project_default_result string: which result shall be -- collected, including recursive dependencies? -- @field collect_project_results table: sorted list of results to be -- collected @@ -363,7 +363,7 @@ function load_user_config2(info, path, types) end local g = {} -- compose the environment for the config file - g.env = info.env -- env + g.env = info.env -- env g.string = string -- string for _,type in ipairs(types) do g[type] = f[type] -- and some config functions @@ -487,7 +487,7 @@ function collect_project_info(info, skip_load_config) info.root_server = "file://" .. info.root info.root_server_name = "." - -- the proj_storage server is equivalent to + -- the proj_storage server is equivalent to -- info.default_repo_server:info.project-locaton info.proj_storage_server_name = "proj-storage" @@ -609,7 +609,7 @@ function collect_project_info(info, skip_load_config) if not rc then return false, e:cat(re) end - + -- licences rc, re = load_user_config(info, info.root .. "/proj/licences", info, "licences", "e2licence") @@ -625,7 +625,7 @@ function collect_project_info(info, skip_load_config) table.sort(info.licences_sorted) rc, re = load_source_config(info) - if not rc then + if not rc then return false, e:cat(re) end @@ -654,7 +654,7 @@ function collect_project_info(info, skip_load_config) end -- read .e2/proj-location - info.project_location_config = string.format("%s/.e2/project-location", + info.project_location_config = string.format("%s/.e2/project-location", info.root) local line, re = e2lib.read_line(info.project_location_config) if not line then @@ -1074,7 +1074,7 @@ function projid(info) local hc = hash.hash_start() for f in e2lib.directory(info.root .. "/proj/init") do if not e2lib.is_backup_file(f) then - local location = string.format("proj/init/%s", + local location = string.format("proj/init/%s", e2lib.basename(f)) local f = { server = info.root_server_name, @@ -1153,10 +1153,10 @@ end -- e2tool.tag_available(info, check_local, check_remote) -- -- Return true if the tags are available, false if not. --- Choose local and remote checking by setting check_local and +-- Choose local and remote checking by setting check_local and -- check_remote. -- --- TODO: works with the null project. Use and/or write scm specific +-- TODO: works with the null project. Use and/or write scm specific -- code to make it usable for projects that use non-git scms. function tag_available(info, check_local, check_remote) @@ -1172,7 +1172,7 @@ function tag_available(info, check_local, check_remote) e2lib.shquote(s.tag)) rc = e2lib.callcmd_capture(cmd) if rc ~= 0 then - e2lib.log(1, "Fatal: source " .. s.name + e2lib.log(1, "Fatal: source " .. s.name .. ": local tag not available: " .. s.tag) rc = false end @@ -1184,7 +1184,7 @@ function tag_available(info, check_local, check_remote) e2lib.shquote(s.tag)) rc = e2lib.callcmd_capture(cmd) if rc ~= 0 then - e2lib.log(1, "Fatal: " .. s.name .. ": remote tag not available: " + e2lib.log(1, "Fatal: " .. s.name .. ": remote tag not available: " .. s.tag) rc = false end @@ -1197,7 +1197,7 @@ end -- e2tool.pre_tag_check(info, check_local, check_remote) -- -- Return true if all checks succeed and false if not. --- For offline usage local and remote checking can be turned on +-- For offline usage local and remote checking can be turned on -- as needed. function pre_tag_check(info, tag, check_local, check_remote) @@ -1214,8 +1214,8 @@ function pre_tag_check(info, tag, check_local, check_remote) end -- return false if any fatal errors occured - if not e2_has_fixed_tag_flag or - has_pseudotags_flag or + if not e2_has_fixed_tag_flag or + has_pseudotags_flag or tag_unavailable_flag or e2_tag_exists_flag then return false @@ -1245,7 +1245,7 @@ end function hashcache_setup(info) local e = new_error("reading hash cache") local rc, re - e2lib.logf(4, "loading hashcache from file: %s", info.hashcache_file) + e2lib.logf(4, "loading hashcache from file: %s", info.hashcache_file) info.hashcache = {} local c, msg = loadfile(info.hashcache_file) if not c then @@ -1668,7 +1668,7 @@ function chrootgroupid(info, groupname) end hc:hash_line(fileid) end - e2lib.log(4, string.format("hash data for chroot group %s\n%s", + e2lib.log(4, string.format("hash data for chroot group %s\n%s", groupname, hc.data)) g.groupid = hc:hash_finish() return g.groupid @@ -1704,7 +1704,7 @@ function envid(info, resultname) end function add_source_result(info, sourcename, source_set) - e2lib.log(3, string.format("adding source result for source %s", + e2lib.log(3, string.format("adding source result for source %s", sourcename)) local src = info.sources[sourcename] local r = {} @@ -1875,7 +1875,7 @@ function check_result(info, resultname) end if res.files then e2lib.warnf("WDEPRECATED", "in result %s", resultname) - e2lib.warnf("WDEPRECATED", + e2lib.warnf("WDEPRECATED", " files attribute is deprecated and no longer used") res.files = nil end @@ -2234,7 +2234,7 @@ function buildnumber_mergefromresults(info) for r, res in pairs(info.results) do local bn = info.build_numbers[r] if not bn then - e2lib.warnf("WOTHER", + e2lib.warnf("WOTHER", "creating new build number entry for result: %s", r) -- create a new entry bn = {} @@ -2419,7 +2419,7 @@ function select_result(info, r, force_rebuild, request_buildno, keep_chroo end ---- select results based upon a list of results usually given on the +--- select results based upon a list of results usually given on the -- command line. Parameters are assigned to all selected results. -- @param info the info structure -- @param results table: list of result names @@ -2450,7 +2450,7 @@ function print_selection(info, results) if not res then return false, e:append("no such result: %s", r) end - local s = res.selected and "[ selected ]" or + local s = res.selected and "[ selected ]" or "[dependency]" local f = res.force_rebuild and "[force rebuild]" or "" local b = res.request_buildno and "[request buildno]" or "" @@ -2808,7 +2808,7 @@ function load_result_config(info) end --- set umask to value used for build processes --- @param info +-- @param info function set_umask(info) e2lib.logf(4, "setting umask to %04o", info.chroot_umask) e2util.umask(info.chroot_umask) @@ -2842,7 +2842,7 @@ local function generatePath(base, str, postfix) end return base end - + -- get directory for a result -- Returns the path to the resultdir and the optional postfix is appended -- with a slash (e.g. res/name/build-script) diff --git a/local/fetch-sources.lua b/local/fetch-sources.lua index f2ba774..a64974c 100755 --- a/local/fetch-sources.lua +++ b/local/fetch-sources.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -90,7 +90,7 @@ end if #opts.arguments > 0 then opts.selection = true end -if not (opts.scm or opts.files or opts.chroot or opts.selection +if not (opts.scm or opts.files or opts.chroot or opts.selection or opts.git or opts.cvs or opts.svn) then e2lib.warn("WOTHER", "Selecting scm sources by default") opts.scm = true @@ -159,7 +159,7 @@ function fetch_sources(info, opts, sel) end end end - + -- update for _, s in pairs(info.sources) do local has_wc = scm.has_working_copy(info, s.name) @@ -172,7 +172,7 @@ function fetch_sources(info, opts, sel) e2lib.log(1, "updating working copy for " .. s.name) local rc, re = scm.update(info, s.name) if not rc then - e2lib.log(4, string.format("updating working copy failed: %s", + e2lib.log(4, string.format("updating working copy failed: %s", s.name)) e:cat(re) end @@ -241,7 +241,7 @@ if opts.chroot then end end -if opts.scm or opts.files or opts.git or opts.cvs or opts.svn or +if opts.scm or opts.files or opts.git or opts.cvs or opts.svn or opts.selection then e2lib.log(2, "fetching sources...") local rc, re = fetch_sources(info, opts, sel) diff --git a/local/files.lua b/local/files.lua index 54886a5..f232365 100644 --- a/local/files.lua +++ b/local/files.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -118,7 +118,7 @@ function files.cache_source(info, sourcename) local s = info.sources[sourcename] -- cache all files for this source for i,f in pairs(s.file) do - e2lib.log(4, string.format("files.cache_source: caching file %s:%s", + e2lib.log(4, string.format("files.cache_source: caching file %s:%s", f.server, f.location)) local flags = { cache = true } if f.server ~= info.root_server_name then @@ -127,7 +127,7 @@ function files.cache_source(info, sourcename) return false, e end else - e2lib.log(4, string.format("not caching %s:%s (stored locally)", + e2lib.log(4, string.format("not caching %s:%s (stored locally)", f.server, f.location)) end end @@ -206,7 +206,7 @@ function files.prepare_source(info, sourcename, sourceset, buildpath) symlink = buildpath .. "/" .. sourcename if file.unpack ~= sourcename then if not e2util.symlink(file.unpack, symlink) then - return false, e:append("cannot create symlink: %s -> %s", symlink, + return false, e:append("cannot create symlink: %s -> %s", symlink, file.unpack) end end @@ -264,7 +264,7 @@ function files.prepare_source(info, sourcename, sourceset, buildpath) return false, e:cat(re) end else - e2lib.abort(string.format("missing destiny for file %s (%s)", + e2lib.abort(string.format("missing destiny for file %s (%s)", file.location, file.server)) end end @@ -298,7 +298,7 @@ function files.display(info, sourcename) if src.sourceid then display[i] = string.format("sourceid = %s", src.sourceid) i = i + 1 - end + end return display end @@ -324,7 +324,7 @@ function files.sourceid(info, sourcename, sourceset) local hc = hash.hash_start() hash.hash_line(hc, src.name) hash.hash_line(hc, src.type) - hash.hash_line(hc, src._env:id()) + hash.hash_line(hc, src._env:id()) for _,l in ipairs(src.licences) do hash.hash_line(hc, l) local licenceid, re = e2tool.licenceid(info, l) @@ -345,7 +345,7 @@ function files.sourceid(info, sourcename, sourceset) hash.hash_line(hc, tostring(f.patch)) hash.hash_line(hc, tostring(f.copy)) end - e2lib.log(4, string.format("hash data for source %s\n%s", src.name, + e2lib.log(4, string.format("hash data for source %s\n%s", src.name, hc.data)) src.sourceid = hash.hash_finish(hc) return true, nil, src.sourceid diff --git a/local/git.lua b/local/git.lua index 9e6e081..f8b5a18 100644 --- a/local/git.lua +++ b/local/git.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -47,7 +47,7 @@ function git_branch_get(gitdir) if not line then break end - local x + local x -- search for a line matching '* ' x, branch = line:match("^(\* )(%S*)$") if x and branch then @@ -137,18 +137,18 @@ function source_apply_default_licences(info, sourcename) src.licences_default_applied = true if not src.licences and src.licence then e2lib.warnf("WDEPRECATED", "in source %s:", src.name) - e2lib.warnf("WDEPRECATED", + e2lib.warnf("WDEPRECATED", " licence attribute is deprecated. Replace by licences.") src.licences = src.licence end if not src.licences then e2lib.warnf("WDEFAULT", "in source %s:", src.name) - e2lib.warnf("WDEFAULT", + e2lib.warnf("WDEFAULT", " licences attribute missing. Defaulting to empty list.") src.licences = {} elseif type(src.licences) == "string" then e2lib.warnf("WDEPRECATED", "in source %s:", src.name) - e2lib.warnf("WDEPRECATED", + e2lib.warnf("WDEPRECATED", " licences attribute is not in table format. Converting.") src.licences = { src.licences } end @@ -383,7 +383,7 @@ function git.fetch_source(info, sourcename) e2lib.log(2, string.format("cloning %s:%s [%s]", src.server, src.location, src.branch)) local skip_checkout = e2lib.globals.git_skip_checkout - rc, re = generic_git.git_clone_from_server(info.cache, src.server, + rc, re = generic_git.git_clone_from_server(info.cache, src.server, src.location, wrk, skip_checkout) if not rc then return false, e:cat(re) @@ -399,7 +399,7 @@ function git.fetch_source(info, sourcename) start_point) if not rc then return false, e:cat(re) - end + end local rc, re = generic_git.git_checkout1(wrk, src.branch) if not rc then return false, e:cat(re) @@ -543,8 +543,8 @@ function git.git_url(c, server, location) end function git.git_remote_add(c, lserver, llocation, name, rserver, rlocation) - e2lib.log(4, string.format("%s, %s, %s, %s, %s, %s", - tostring(c), tostring(lserver), tostring(llocation), + e2lib.log(4, string.format("%s, %s, %s, %s, %s, %s", + tostring(c), tostring(lserver), tostring(llocation), tostring(name), tostring(rserver), tostring(rlocation))) local rurl, e = cache.remote_url(c, rserver, rlocation) if not rurl then @@ -574,7 +574,7 @@ function git.display(info, sourcename) if not rc then return nil, e:cat(re) end - -- try to calculte the sourceid, but do not care if it fails. + -- try to calculte the sourceid, but do not care if it fails. -- working copy might be unavailable scm.sourceid(info, sourcename, "tag") scm.sourceid(info, sourcename, "branch") diff --git a/local/linux32.c b/local/linux32.c index 363a33c..8a34935 100644 --- a/local/linux32.c +++ b/local/linux32.c @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -33,7 +33,7 @@ //#include //#undef personality #include -#include +#include #include #include #include @@ -43,7 +43,7 @@ #include #include #include - + /* taken from x86_64 headers */ #define PER_LINUX32 0x0008 diff --git a/local/ls-project.lua b/local/ls-project.lua index 6a1bca2..4d2d374 100755 --- a/local/ls-project.lua +++ b/local/ls-project.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -120,7 +120,7 @@ local function p3(s1, s2, k, v) -- remove leading spaces, that allows easier string -- append code below, where collecting multiple items while v:sub(1,1) == " " do - + v = v:sub(2) end print(string.format(" %s %s o--%-10s = %s", s1, s2, k, v)) diff --git a/local/make/Makefile b/local/make/Makefile index bb4c807..b2f210c 100644 --- a/local/make/Makefile +++ b/local/make/Makefile @@ -4,28 +4,28 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -SUBDIRS = +SUBDIRS = TOPLEVEL = ../.. include $(TOPLEVEL)/make.vars diff --git a/local/make/build.sh b/local/make/build.sh index eab7028..4045a73 100755 --- a/local/make/build.sh +++ b/local/make/build.sh @@ -5,23 +5,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/local/make/buildall.sh b/local/make/buildall.sh index 391d261..f99dbf8 100755 --- a/local/make/buildall.sh +++ b/local/make/buildall.sh @@ -5,23 +5,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/local/make/detect_tool b/local/make/detect_tool index 81e7b88..42d89a0 100755 --- a/local/make/detect_tool +++ b/local/make/detect_tool @@ -5,23 +5,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/local/make/makefile.collect_project b/local/make/makefile.collect_project index 5ee73fd..fc98736 100644 --- a/local/make/makefile.collect_project +++ b/local/make/makefile.collect_project @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/local/make/makefile.res.template b/local/make/makefile.res.template index 4e1b098..36c8832 100644 --- a/local/make/makefile.res.template +++ b/local/make/makefile.res.template @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/local/make/makefile.template b/local/make/makefile.template index f217011..3b80919 100644 --- a/local/make/makefile.template +++ b/local/make/makefile.template @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/local/new-source.lua b/local/new-source.lua index b99c4ca..9286850 100644 --- a/local/new-source.lua +++ b/local/new-source.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -44,9 +44,9 @@ usage: e2-new-source --git [--server ] Put new source onto an existing server. --git - Put a repository named into the projects' 'git/' directory on + Put a repository named into the projects' 'git/' directory on the server, i.e. //git/.git - The server defaults to the default repository server, and the + The server defaults to the default repository server, and the part is the project location relative to the projects server. --files @@ -69,7 +69,7 @@ local opts = e2option.parse(arg) -- @return a table with fields checksum and checksum_type ("sha1", "md5") -- @return nil, or an error string on error function read_checksum(checksum_file, filename) - e2lib.log(4, string.format("read_checksum(%s, %s)", checksum_file, + e2lib.log(4, string.format("read_checksum(%s, %s)", checksum_file, filename)) local f, e = io.open(checksum_file, "r") if not f then @@ -155,7 +155,7 @@ end -- @param flags table: flags -- @return bool -- @return nil, an error string on error -function new_files_source(c, server, location, source_file, checksum_file, +function new_files_source(c, server, location, source_file, checksum_file, checksum_file_format, no_checksum) local source_file_base = e2lib.basename(source_file) local do_checksum = (not no_checksum) @@ -175,7 +175,7 @@ function new_files_source(c, server, location, source_file, checksum_file, if not e2lib.chdir(tmpdir) then e2lib.abort("can't chdir") end - + -- download e2lib.log(1, string.format("fetching %s ...", source_file)) local rc, re = download(source_file) @@ -191,7 +191,7 @@ function new_files_source(c, server, location, source_file, checksum_file, e2lib.abort(re) end checksum_file_base = e2lib.basename(checksum_file) - checksum_file1 = string.format("%s.orig", + checksum_file1 = string.format("%s.orig", checksum_file_base) rc = mv(checksum_file_base, checksum_file1) if not rc then @@ -215,7 +215,7 @@ function new_files_source(c, server, location, source_file, checksum_file, if do_checksum then if cs1.checksum == cs2.checksum then e2lib.log(2, string.format( - "checksum matches (%s): %s", + "checksum matches (%s): %s", cs1.checksum_type, cs1.checksum)) else e2lib.abort("checksum mismatch") @@ -225,7 +225,7 @@ function new_files_source(c, server, location, source_file, checksum_file, -- store local flags = {} local rlocation = string.format("%s/%s", location, source_file_base) - e2lib.log(1, string.format("storing file %s to %s:%s", + e2lib.log(1, string.format("storing file %s to %s:%s", source_file_base, server, rlocation)) local rc, e = cache.push_file(c, source_file_base, server, rlocation, flags) @@ -233,7 +233,7 @@ function new_files_source(c, server, location, source_file, checksum_file, e2lib.abort(e) end local rlocation = string.format("%s/%s", location, checksum_file2) - e2lib.log(1, string.format("storing file %s to %s:%s", + e2lib.log(1, string.format("storing file %s to %s:%s", checksum_file2, server, rlocation)) local rc, e = cache.push_file(c, checksum_file2, server, rlocation, flags) @@ -288,10 +288,10 @@ elseif opts.files then if not no_checksum and not checksum_file then e2lib.abort("checksum file not given") end - local rc = new_files_source(info.cache, server, location, source_file, + local rc = new_files_source(info.cache, server, location, source_file, checksum_file, checksum_file_format, no_checksum) else - e2lib.log(1, + e2lib.log(1, "Creating repositories other than git is not supported yet.\n".. "You might nevertheless use 'e2-use-source' to use existing\n".. "sources in your project") diff --git a/local/playground.lua b/local/playground.lua index 51c274c..319c330 100644 --- a/local/playground.lua +++ b/local/playground.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] diff --git a/local/policy.lua b/local/policy.lua index 823b9b0..38c983d 100644 --- a/local/policy.lua +++ b/local/policy.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -78,7 +78,7 @@ end --- set a policy mode to a value -- @class function -- @name policy.set --- @param id string: the policy identifier: storage, source_set, dep_set, +-- @param id string: the policy identifier: storage, source_set, dep_set, -- buildid -- @param val the function to use : storage_*, source_set_*, etc. -- @return nil @@ -95,7 +95,7 @@ end --- get a policy function -- @class function -- @name policy.get --- @param id string: the policy identifier: storage, source_set, dep_set, +-- @param id string: the policy identifier: storage, source_set, dep_set, -- buildid -- @return function: the policy function function get(mode, id) diff --git a/local/svn.lua b/local/svn.lua index dbf3ad0..78baf83 100644 --- a/local/svn.lua +++ b/local/svn.lua @@ -4,23 +4,23 @@ Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH - + For more information have a look at http://www.e2factory.org e2factory is a registered trademark by emlix GmbH. This file is part of e2factory, the emlix embedded build system. - + e2factory is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . ]] @@ -223,7 +223,7 @@ function svn.sourceid(info, sourcename, source_set) --OK local hc = hash.hash_start() hash.hash_line(hc, src.name) hash.hash_line(hc, src.type) - hash.hash_line(hc, src._env:id()) + hash.hash_line(hc, src._env:id()) for _,l in pairs(src.licences) do hash.hash_line(hc, l) end diff --git a/lua/Makefile b/lua/Makefile index 0710cce..b7e73a1 100644 --- a/lua/Makefile +++ b/lua/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # @@ -53,7 +53,7 @@ install: all install -m644 $(LUA_UNPACK_PATH)/lua-5.1.3/src/lualib.h $(DESTDIR)$(INCDIR)/lua-5.1.3; \ install -m644 $(LUA_UNPACK_PATH)/lua-5.1.3/src/luaconf.h $(DESTDIR)$(INCDIR)/lua-5.1.3; \ -uninstall: +uninstall: rm -f $(DESTDIR)$(LIBEXECDIR)/e2-lua-5.1.3; \ rm -f $(DESTDIR)$(LIBEXECDIR)/e2-luac-5.1.3; \ rm -fr $(DESTDIR)$(LIBEXECDIR)/lua-5.1.3; \ diff --git a/make.vars b/make.vars index 1ef6d55..f03894e 100644 --- a/make.vars +++ b/make.vars @@ -54,7 +54,7 @@ SYSCONFDIR = /etc/e2 MANDIR = $(SHAREDIR)/man DOCDIR = $(SHAREDIR)/doc/e2 TOOLDIR = $(LIBEXECDIR)/tools -export PREFIX BINDIR LIBDIR INCDIR MANDIR TOOLDIR LIBEXECDIR LOCALSTATEDIR +export PREFIX BINDIR LIBDIR INCDIR MANDIR TOOLDIR LIBEXECDIR LOCALSTATEDIR export SYSCONFDIR LOCALPREFIX = $(PROJECTDIR)/.e2 diff --git a/server-tools/Makefile b/server-tools/Makefile index f332aec..cba4a72 100644 --- a/server-tools/Makefile +++ b/server-tools/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/server/Makefile b/server/Makefile index b4b09d3..1b2f739 100644 --- a/server/Makefile +++ b/server/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # diff --git a/server/web/retrieve-build-numbers.lua.in b/server/web/retrieve-build-numbers.lua.in index 5afd96e..c0096af 100644 --- a/server/web/retrieve-build-numbers.lua.in +++ b/server/web/retrieve-build-numbers.lua.in @@ -24,7 +24,7 @@ local function readbn(str) local t = {} for ln in string.gmatch(str, "[^\n]*\n") do if not string.match(ln, "^%s*$") then - local res, bid, status, num = + local res, bid, status, num = string.match(ln, "([-%w_]+)%s+(%x+)%s+(%S+)%s+(%d+)") if res then t[ res ] = { id = bid, num = num, status = status } diff --git a/server/web/store-run-log.lua.in b/server/web/store-run-log.lua.in index 827a19d..33a4b4d 100644 --- a/server/web/store-run-log.lua.in +++ b/server/web/store-run-log.lua.in @@ -4,7 +4,7 @@ -- -- body: log-file section -- --- query string: +-- query string: -- -- host= -- user= diff --git a/templates/Makefile b/templates/Makefile index 5866b19..2956b06 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # @@ -63,4 +63,4 @@ uninstall: doc: install-doc: - + diff --git a/templates/local/build-script b/templates/local/build-script index c6a69a7..a314d50 100644 --- a/templates/local/build-script +++ b/templates/local/build-script @@ -1,7 +1,7 @@ # e2factory build script template # # The build system provides the following variables for use in build scripts: -# - E2_TMPDIR pointing to a temporary directory with a directory +# - E2_TMPDIR pointing to a temporary directory with a directory # structure # - E2_RESULT the name of the result currently building # - E2_BUILD_NUMBER the build number, 0 by default @@ -16,7 +16,7 @@ # installing software for packaging # ./env files containing environment variables are located here # ./init init scripts are located here -# ./script this directory holds the build driver and the build +# ./script this directory holds the build driver and the build # script # ./in This directory is available but unused # ./dep/ These directories hold result files from dependency diff --git a/templates/local/source.cvs b/templates/local/source.cvs index ebb1ddd..f2ea133 100644 --- a/templates/local/source.cvs +++ b/templates/local/source.cvs @@ -2,7 +2,7 @@ e2source { -- the source name - -- (is derived from the config file path if only one source is + -- (is derived from the config file path if only one source is -- specified per file) name = "name", -- the source type diff --git a/templates/local/source.git b/templates/local/source.git index 8701252..7e88ef2 100644 --- a/templates/local/source.git +++ b/templates/local/source.git @@ -2,7 +2,7 @@ e2source { -- the source name - -- (is derived from the config file path if only one source is + -- (is derived from the config file path if only one source is -- specified per file) name = "name", -- the source type diff --git a/templates/local/source.svn b/templates/local/source.svn index a8f334d..a5539e8 100644 --- a/templates/local/source.svn +++ b/templates/local/source.svn @@ -2,7 +2,7 @@ e2source { -- the source name - -- (is derived from the config file path if only one source is + -- (is derived from the config file path if only one source is -- specified per file) name = "name", -- the source type diff --git a/test/Makefile b/test/Makefile index 8f6b804..5d9258c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,23 +4,23 @@ # Copyright (C) 2007-2009 Gordon Hecker , emlix GmbH # Copyright (C) 2007-2009 Oskar Schirmer , emlix GmbH # Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH -# +# # For more information have a look at http://www.e2factory.org # # e2factory is a registered trademark by emlix GmbH. # # This file is part of e2factory, the emlix embedded build system. -# +# # e2factory is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -- 2.39.5