anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync 13x and 14x

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10297 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-07-17 21:31:02 +00:00
parent c32b732f9d
commit b72724a9b6
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
development/Win32/packaging/README
View File

@ -34,7 +34,8 @@ the process:
* Remove all stuff generated by running configure. It makes sense on * Remove all stuff generated by running configure. It makes sense on
your machine only, not for whoever is installing LyX. Specifically your machine only, not for whoever is installing LyX. Specifically
doc/LaTeXConfig.lyx, lyxrc.defaults, packages.lst and textclass.lst xfonts/fonts.dir, xfonts/fonts.scale, doc/LaTeXConfig.lyx,
lyxrc.defaults, packages.lst and textclass.lst
should all be removed. should all be removed.

32
development/Win32/packaging/build_lyxwin.sh
View File

@ -36,17 +36,16 @@
# It compiles the static version of the Aspell libraries because no # It compiles the static version of the Aspell libraries because no
# .dll version exists. # .dll version exists.
HOME="/home/Angus" # You may need to change these four variables.
MINGW_DIR="/j/MinGW"
# You may need to change these three variables.
QT_DIR="${HOME}"/qt3 QT_DIR="${HOME}"/qt3
ASPELL_DIR="${HOME}"/aspell-0.50.5 ASPELL_DIR="${HOME}"/aspell-0.50.5
# A space-separated string of directories # A space-separated string of directories
# ASPELL_DICT_DIRS="${HOME}/aspell-en-0.50-2 ${HOME}/aspell-de-0.50-2 " # ASPELL_DICT_DIRS="${HOME}/aspell-en-0.50-2 ${HOME}/aspell-de-0.50-2 "
ASPELL_DICT_DIRS="${HOME}/aspell-en-0.50-2" ASPELL_DICT_DIRS="${HOME}/aspell-en-0.50-2"
LYX_DIR="${HOME}"/lyx/13x
# Everything from here on down should be OK "as is". # Everything from here on down should be OK "as is".
LYX_DIR="../../.."
PACKAGING_DIR="$LYX_DIR/development/Win32/packaging" PACKAGING_DIR="$LYX_DIR/development/Win32/packaging"
DTL_DIR="$PACKAGING_DIR/dtl" DTL_DIR="$PACKAGING_DIR/dtl"
CLEAN_DVI_DIR="$PACKAGING_DIR" CLEAN_DVI_DIR="$PACKAGING_DIR"
@ -58,12 +57,12 @@ LYX_INSTALL_DIR=installprefix
# These are all installed in the final LyX package # These are all installed in the final LyX package
QT_DLL="${QT_DIR}/bin/qt-mt3.dll" QT_DLL="${QT_DIR}/bin/qt-mt3.dll"
LIBICONV_DLL="/j/MinGW/bin/libiconv-2.dll" LIBICONV_DLL="${MINGW_DIR}/bin/libiconv-2.dll"
MINGW_DLL="/j/MinGW/bin/mingwm10.dll" MINGW_DLL="${MINGW_DIR}/bin/mingwm10.dll"
DT2DV="$DTL_DIR/dt2dv.exe" DT2DV="${DTL_DIR}/dt2dv.exe"
DV2DT="$DTL_DIR/dv2dt.exe" DV2DT="${DTL_DIR}/dv2dt.exe"
CLEAN_DVI_PY="$CLEAN_DVI_DIR/clean_dvi.py" CLEAN_DVI_PY="${CLEAN_DVI_DIR}/clean_dvi.py"
# Change this to 'mv -f' when you are confident that # Change this to 'mv -f' when you are confident that
# the various sed scripts are working correctly. # the various sed scripts are working correctly.
@ -242,12 +241,13 @@ build_lyx()
# Check the line endings of configure.ac # Check the line endings of configure.ac
# The configure script will be unable to create config.h if it # The configure script will be unable to create config.h if it
# contains Win32-style line endings. # contains Win32-style line endings.
rm -f configure.ac
sed 's/ sed 's/
$//' ${LYX_DIR}/configure.ac > configure.ac.$$ $//' config/configure.ac > configure.ac.$$
cmp -s ${LYX_DIR}/configure.ac configure.ac.$$ && { cmp -s config/configure.ac configure.ac.$$ && {
rm -f configure.ac.$$ rm -f configure.ac.$$
} || { } || {
mv -f configure.ac.$$ ${LYX_DIR}/configure.ac mv -f configure.ac.$$ config/configure.ac
echo 'configure.ac has Win32-style line endings. Corrected' >&2 echo 'configure.ac has Win32-style line endings. Corrected' >&2
} }
@ -299,7 +299,7 @@ install_lyx()
} }
make install || { make install || {
echo "Failed to install $LYX_DIR" >&2 echo "Failed to install" >&2
exit 1 exit 1
} }
) )
@ -311,9 +311,9 @@ test $# -ne 0 && LYX_VERSION_STR=$1
check_dirs_exist || exit 1 check_dirs_exist || exit 1
query_qt || exit 1 query_qt || exit 1
check_files_exist || exit 1 check_files_exist || exit 1
#build_dtl || exit 1 build_dtl || exit 1
#build_aspell || exit 1 build_aspell || exit 1
#build_aspell_dicts || exit 1 build_aspell_dicts || exit 1
build_lyx || exit 1 build_lyx || exit 1
install_lyx || exit 1 install_lyx || exit 1
# The end # The end

2
development/Win32/packaging/package_lyxwin.sh
View File

@ -17,6 +17,7 @@
# ensure that the generated .dvi file is usable. # ensure that the generated .dvi file is usable.
# It removes all stuff generated by running configure: # It removes all stuff generated by running configure:
# xfonts/
# doc/LaTeXConfig.lyx # doc/LaTeXConfig.lyx
# lyxrc.defaults # lyxrc.defaults
# packages.lst # packages.lst
@ -96,6 +97,7 @@ a\
# Strip the executables # Strip the executables
( (
cd "${LYX_INSTALL_DIR}/Resources/lyx" cd "${LYX_INSTALL_DIR}/Resources/lyx"
rm -rf xfonts
for file in doc/LaTeXConfig.lyx lyxrc.defaults packages.lst textclass.lst for file in doc/LaTeXConfig.lyx lyxrc.defaults packages.lst textclass.lst
do do
rm -f $file rm -f $file