mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
Rename version.C.in to version.cpp.in, and Package.C.in to package.cpp.in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18074 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
9e3045980e
commit
153c9b0461
@ -417,7 +417,7 @@ AC_CONFIG_FILES([Makefile m4/Makefile \
|
||||
sourcedoc/Makefile \
|
||||
src/client/Makefile \
|
||||
src/Makefile \
|
||||
src/version.C-tmp:src/version.C.in \
|
||||
src/version.C-tmp:src/version.cpp.in \
|
||||
src/tex2lyx/Makefile \
|
||||
src/mathed/Makefile \
|
||||
src/graphics/Makefile \
|
||||
|
@ -18,7 +18,7 @@ if(NOT MERGE_FILES)
|
||||
endif(NOT MERGE_FILES)
|
||||
|
||||
|
||||
configure_file(${TOP_SRC_DIR}/src/version.C.in ${CMAKE_CURRENT_BINARY_DIR}/version.C)
|
||||
configure_file(${TOP_SRC_DIR}/src/version.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/version.C)
|
||||
|
||||
file(GLOB lyx_sources ${TOP_SRC_DIR}/src/${LYX_CPP_FILES})
|
||||
file(GLOB lyx_headers ${TOP_SRC_DIR}/src/${LYX_HPP_FILES})
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
project(support)
|
||||
|
||||
configure_file(${TOP_SRC_DIR}/src/support/Package.C.in
|
||||
configure_file(${TOP_SRC_DIR}/src/support/Package.cpp.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/package.C)
|
||||
|
||||
file(GLOB support_sources ${TOP_SRC_DIR}/src/support/${LYX_CPP_FILES})
|
||||
|
@ -362,17 +362,17 @@ env.AppendUnique(LIBPATH = ['$LOCALLIBPATH'])
|
||||
# 3. compiler commands and flags like CCFLAGS.
|
||||
# MSGFMT used to process po files
|
||||
# 4. Variables that will be used to replace variables in some_file.in
|
||||
# src/support/Package.C.in:
|
||||
# src/support/Package.cpp.in:
|
||||
# TOP_SRCDIR, LOCALEDIR, LYX_DIR, PROGRAM_SUFFIX
|
||||
# lib/lyx2lyx/lyx2lyx_version.py.in
|
||||
# PACKAGE_VERSION
|
||||
# src/version.C.in
|
||||
# src/version.cpp.in
|
||||
# PACKAGE_VERSION, LYX_DATE, VERSION_INFO
|
||||
|
||||
# full path name is used to build msvs project files
|
||||
# and to replace TOP_SRCDIR in package.C
|
||||
env['TOP_SRCDIR'] = Dir(top_src_dir).abspath
|
||||
# needed by src/version.C.in => src/version.C
|
||||
# needed by src/version.cpp.in => src/version.C
|
||||
env['PACKAGE_VERSION'] = package_version
|
||||
env['LYX_DATE'] = time.asctime()
|
||||
|
||||
@ -400,12 +400,12 @@ if env.has_key('version_suffix'):
|
||||
program_suffix = env['version_suffix']
|
||||
else:
|
||||
program_suffix = ''
|
||||
# used by Package.C.in
|
||||
# used by Package.cpp.in
|
||||
env['PROGRAM_SUFFIX'] = program_suffix
|
||||
|
||||
# whether or not add suffix to file and directory names
|
||||
add_suffix = packaging_method != 'windows'
|
||||
# LYX_DIR are different (used in Package.C.in)
|
||||
# LYX_DIR are different (used in Package.cpp.in)
|
||||
if add_suffix:
|
||||
env['LYX_DIR'] = Dir(os.path.join(prefix, share_dir + program_suffix)).abspath
|
||||
else:
|
||||
@ -1639,7 +1639,7 @@ if build_support:
|
||||
print "Processing files in src/support..."
|
||||
|
||||
frontend_env.Depends('$BUILDDIR/common/support/package.C', '$BUILDDIR/common/config.h')
|
||||
env.substFile('$BUILDDIR/common/support/package.C', '$TOP_SRCDIR/src/support/Package.C.in')
|
||||
env.substFile('$BUILDDIR/common/support/package.C', '$TOP_SRCDIR/src/support/Package.cpp.in')
|
||||
|
||||
support = frontend_env.StaticLibrary(
|
||||
target = '$LOCALLIBPATH/support',
|
||||
@ -1821,7 +1821,7 @@ if build_lyxbase:
|
||||
print "Processing files in src..."
|
||||
|
||||
env.Depends('$BUILDDIR/common/version.C', '$BUILDDIR/common/config.h')
|
||||
env.substFile('$BUILDDIR/common/version.C', '$TOP_SRCDIR/src/version.C.in')
|
||||
env.substFile('$BUILDDIR/common/version.C', '$TOP_SRCDIR/src/version.cpp.in')
|
||||
|
||||
if env.has_key('USE_ASPELL') and env['USE_ASPELL']:
|
||||
src_post_files.append('ASpell.cpp')
|
||||
|
@ -371,8 +371,8 @@ ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS)
|
||||
LC_ALL=C ; export LC_ALL ; \
|
||||
rm -f $@-t \
|
||||
&& ( cd $(top_srcdir); \
|
||||
grep -l "_(\".*\")" `find src \( -name '*.[ch]' -o -name '*.cpp' -o -name '*.C.in' \) -print` |\
|
||||
grep -v -e "src/support/package.C$$" |\
|
||||
grep -l "_(\".*\")" `find src \( -name '*.[ch]' -o -name '*.cpp' -o -name '*.cpp.in' \) -print` |\
|
||||
grep -v -e "src/support/Package.cpp$$" |\
|
||||
sort | uniq ) > $@-t \
|
||||
&& mv $@-t $@
|
||||
|
||||
|
@ -134,7 +134,7 @@ src/output.cpp
|
||||
src/output_plaintext.cpp
|
||||
src/rowpainter.cpp
|
||||
src/support/FileFilterList.cpp
|
||||
src/support/Package.C.in
|
||||
src/support/Package.cpp.in
|
||||
src/support/os_win32.cpp
|
||||
src/support/userinfo.cpp
|
||||
src/tex-strings.cpp
|
||||
|
@ -10,7 +10,7 @@ endif
|
||||
|
||||
SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
|
||||
|
||||
EXTRA_DIST = config.h.in stamp-h.in version.C.in \
|
||||
EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \
|
||||
Section.h \
|
||||
Section.cpp \
|
||||
Variables.cpp \
|
||||
|
@ -4,7 +4,7 @@ SUBDIRS = . tests
|
||||
|
||||
CLEANFILES += $(BUILT_SOURCES)
|
||||
|
||||
EXTRA_DIST = Package.C.in pch.h \
|
||||
EXTRA_DIST = Package.cpp.in pch.h \
|
||||
os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
|
||||
|
||||
noinst_LTLIBRARIES = libsupport.la
|
||||
@ -92,13 +92,13 @@ libsupport_la_SOURCES = \
|
||||
package.C: build_package
|
||||
|
||||
# Solaris sed does not like spaces bewteen the ;-delimited commands
|
||||
build_package: Package.C.in
|
||||
build_package: Package.cpp.in
|
||||
@rm -f tmp_package ;\
|
||||
sed "s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\
|
||||
s,@LOCALEDIR@,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
|
||||
s,@TOP_SRCDIR@,$(LYX_ABS_TOP_SRCDIR),;\
|
||||
s,@PROGRAM_SUFFIX@,$(program_suffix)," \
|
||||
$(srcdir)/Package.C.in > tmp_package ;\
|
||||
$(srcdir)/Package.cpp.in > tmp_package ;\
|
||||
if cmp -s tmp_package package.C ; then \
|
||||
rm -f tmp_package ;\
|
||||
else \
|
||||
|
@ -8,7 +8,7 @@
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*
|
||||
* Warning! This file is autogenerated from Package.C.in.
|
||||
* Warning! This file is autogenerated from Package.cpp.in.
|
||||
* All changes to this file will be lost.
|
||||
*/
|
||||
|
||||
@ -700,7 +700,7 @@ bool check_env_var_dir(FileName const & dir,
|
||||
if (!success) {
|
||||
// Put this string on a single line so that the gettext
|
||||
// search mechanism in po/Makefile.in.in will register
|
||||
// Package.C.in as a file containing strings that need
|
||||
// Package.cpp.in as a file containing strings that need
|
||||
// translation.
|
||||
// FIXME UNICODE
|
||||
docstring const fmt =
|
@ -8,7 +8,7 @@
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*
|
||||
* Warning! This file is autogenerated from version.C.in.
|
||||
* Warning! This file is autogenerated from version.cpp.in.
|
||||
* All changes to this file will be lost.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user