Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixing #1851 (related to the livesupport -> campcaster renaming)

Browse source
This commit is contained in:
fgerlits 2006-10-17 09:55:45 +00:00
parent b3f7d85b87
commit a988446e12
4 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
livesupport/src/products/gLiveSupport/etc/Makefile.in
View file

@ -108,9 +108,10 @@ REPLACE_SED_STRING="s/ls_var_dir/${USR_VAR_DIR_S}/; \
s/ls_scheduler_daemon_command/${SCHEDULER_DAEMON_COMMAND_S}/;" s/ls_scheduler_daemon_command/${SCHEDULER_DAEMON_COMMAND_S}/;"
GENRB = @GENRB@ GENRB = @GENRB@
RESOURCE_BUNDLE_NAME = campcaster-studio
GENRBOPTS = --destdir ${TMP_DIR} \ GENRBOPTS = --destdir ${TMP_DIR} \
--encoding utf-8 \ --encoding utf-8 \
--package-name ${PACKAGE_NAME} \ --package-name ${RESOURCE_BUNDLE_NAME} \
--strict --strict
VPATH = ${SRC_DIR} VPATH = ${SRC_DIR}
@ -272,14 +273,14 @@ G_LIVESUPPORT_OBJS = ${TMP_DIR}/GLiveSupport.o \
${TMP_DIR}/RestoreBackupWindow.o \ ${TMP_DIR}/RestoreBackupWindow.o \
${TMP_DIR}/TaskbarIcons.o ${TMP_DIR}/TaskbarIcons.o
G_LIVESUPPORT_RES = ${TMP_DIR}/${PACKAGE_NAME}_root.res \ G_LIVESUPPORT_RES = ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_root.res \
${TMP_DIR}/${PACKAGE_NAME}_en.res \ ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_en.res \
${TMP_DIR}/${PACKAGE_NAME}_es.res \ ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_es.res \
${TMP_DIR}/${PACKAGE_NAME}_hu.res \ ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_hu.res \
${TMP_DIR}/${PACKAGE_NAME}_nl.res \ ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_nl.res \
${TMP_DIR}/${PACKAGE_NAME}_pl.res \ ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_pl.res \
${TMP_DIR}/${PACKAGE_NAME}_sr_CS.res \ ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_sr_CS.res \
${TMP_DIR}/${PACKAGE_NAME}_sr_CS_CYRILLIC.res ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_sr_CS_CYRILLIC.res
G_LIVESUPPORT_EXE_OBJS = ${TMP_DIR}/main.o G_LIVESUPPORT_EXE_OBJS = ${TMP_DIR}/main.o
@ -444,6 +445,6 @@ ${PLAYLIST_EXECUTOR_LIB_FILE}:
${TMP_DIR}/%.o : ${SRC_DIR}/%.cxx ${TMP_DIR}/%.o : ${SRC_DIR}/%.cxx
${CXX} ${CPPFLAGS} ${CXXFLAGS} -c -o $@ $< ${CXX} ${CPPFLAGS} ${CXXFLAGS} -c -o $@ $<
${TMP_DIR}/${PACKAGE_NAME}_%.res : ${VAR_DIR}/%.txt ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_%.res : ${VAR_DIR}/%.txt
${GENRB} ${GENRBOPTS} $^ ${GENRB} ${GENRBOPTS} $^

2
livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml.template
View file

@ -119,7 +119,7 @@
]> ]>
<gLiveSupport> <gLiveSupport>
<resourceBundle path = "ls_var_dir/Campcaster/campcaster-studio" <resourceBundle path = "ls_var_dir/LiveSupport/campcaster-studio"
locale = "en" locale = "en"
/> />

2
livesupport/src/products/gLiveSupport/src/main.cxx
View file

@ -154,8 +154,6 @@ int main ( int argc,
return 1; return 1;
} }
std::cerr << "using config file '" << configFileName << '\'' << std::endl;
Ptr<LiveSupport::GLiveSupport::GLiveSupport>::Ref Ptr<LiveSupport::GLiveSupport::GLiveSupport>::Ref
gLiveSupport(new LiveSupport::GLiveSupport::GLiveSupport()); gLiveSupport(new LiveSupport::GLiveSupport::GLiveSupport());