Skip to content

Commit

Permalink
Moved unix/prebuild.sh input files to dedicated subdirectory.
Browse files Browse the repository at this point in the history
  • Loading branch information
c-lipka committed Aug 9, 2021
1 parent ca89731 commit a98c812
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 18 deletions.
39 changes: 22 additions & 17 deletions unix/prebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ echo "make maintainer-clean" 1>&2 && make maintainer-clean 1>&2 ; \
chmod -R u+rw ../doc/html/
mv -f ../doc/html/*.txt ../doc/
mv -f ../doc/html/*.doc ../doc/
$cp_u -f README.unix ../doc/
$cp_u -f prebuild/README.unix ../doc/
chmod -R u+rw ../doc/

# [C.H.]
Expand Down Expand Up @@ -356,24 +356,29 @@ echo "make maintainer-clean" 1>&2 && make maintainer-clean 1>&2 ; \
*)
# some shells seem unable to expand properly wildcards in the list entries
# (e.g. ../distribution/in*/).
for file in \
AUTHORS ChangeLog configure.ac COPYING NEWS README \
povray.1 povray.conf \

# Directories
for dir in \
scripts \
../distribution/ini ../distribution/include ../distribution/scenes
do
out=`basename $file`
echo "Create ../$out`test -d $file && echo /`"
$cp_u -f -R $file ../ || echo "$file not copied !"
out=`basename $dir`
echo "Create ../$out/"
$cp_u -f -R $dir ../ || echo "$dir not copied !"
chmod -f -R u+rw ../$out
done

# special cases:
# Individual Files
for file in \
AUTHORS ChangeLog configure.ac COPYING INSTALL NEWS README \
povray.1 povray.conf
do
echo "Create ../$file"
$cp_u -f prebuild/$file ../ || echo "$file not copied !"
chmod -f -R u+rw ../$file
done

# INSTALL
echo "Create ../INSTALL"
$cp_u -f install.txt ../INSTALL || echo "INSTALL not copied !"
chmod -f u+rw ../INSTALL
# special cases:

# VERSION
echo "Create ../VERSION"
Expand Down Expand Up @@ -419,7 +424,7 @@ case "$1" in

*)
echo "Create $makefile.am"
cat Makefile.header > $makefile.am
cat prebuild/Makefile.header > $makefile.am
cat << pbEOF >> $makefile.am
# Makefile.am for the source distribution of POV-Ray $pov_version_base for UNIX
Expand Down Expand Up @@ -583,7 +588,7 @@ case "$1" in
scriptfiles=`find scripts -type f`

echo "Create $makefile.am"
cat Makefile.header > $makefile.am
cat prebuild/Makefile.header > $makefile.am
cat << pbEOF >> $makefile.am
# Makefile.am for the source distribution of POV-Ray $pov_version_base for UNIX
Expand Down Expand Up @@ -803,7 +808,7 @@ case "$1" in
files=`find $dir -name "*.cpp" -or -name "*.h" | sed s,"$dir/",,g | sort`

echo "Create $makefile.am"
cat Makefile.header > $makefile.am
cat prebuild/Makefile.header > $makefile.am
cat << pbEOF >> $makefile.am
# Makefile.am for the source distribution of POV-Ray $pov_version_base for UNIX
Expand Down Expand Up @@ -1340,7 +1345,7 @@ case "$1" in
files=`find $dir $dir/unix -maxdepth 1 -name \*.cpp -or -name \*.h | sed s,"$dir/",,g | sort`

echo "Create $makefile.am"
cat Makefile.header > $makefile.am
cat prebuild/Makefile.header > $makefile.am
cat << pbEOF >> $makefile.am
# Makefile.am for the source distribution of POV-Ray $pov_version_base for UNIX
Expand Down Expand Up @@ -1409,7 +1414,7 @@ case "$1" in
done

echo "Create $makefile.am"
cat Makefile.header > $makefile.am
cat prebuild/Makefile.header > $makefile.am
cat << pbEOF >> $makefile.am
# Makefile.am for the source distribution of POV-Ray $pov_version_base for UNIX
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion unix/install.txt → unix/prebuild/INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ news://news.povray.org/povray.unix/ or http://news.povray.org/povray.unix/
| source package, you have received a platform-neutral package. In that case |
| make sure to run the following command before you proceed: |
| |
| cd unix/ ; ./prebuild.sh ; cd ../ |
| unix/prebuild.sh |
+----------------------------------------------------------------------------+

Table of contents
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
18 changes: 18 additions & 0 deletions unix/prebuild/dirinfo.dox
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**

@dir
@brief Files to be moved around or used as input by the `unix/prebuild.sh` script.

This directory primarily contains Unix-specific files that, in a Unix-specific source package,
should be residing in locations that either do not exist in the repository, or which we want to
keep free from platform-specific clutter there.

The files need to be processed and/or moved to their final locations by the `unix/prebuild.sh`
script, which is to be run on the "raw" source package - as stored in the repository - before
running the Autotools-based Unix build process proper (`configure`/`make`).

@note
The originals residing in this directory are not required for the build process proper, and
should therefore not be included in a Unix-specific source package.

*/
File renamed without changes.
File renamed without changes.

0 comments on commit a98c812

Please sign in to comment.