Attachment #314995 for bug #365595

Lines 103-109 else() Link Here

(-)a/CMakeGlobals.txt (-1 / +1 lines)
103	else()	103	else()
104	set(RSTUDIO_INSTALL_BIN bin)	104	set(RSTUDIO_INSTALL_BIN bin)
105	endif()	105	endif()
106	set(RSTUDIO_INSTALL_SUPPORTING .)	106	set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE})
107	endif()	107	endif()
108		108
109	# if the install prefix is /usr/local then tweak as appropriate	109	# if the install prefix is /usr/local then tweak as appropriate




   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
                  ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})

   # install configured redhat init.d script
   set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")

   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
                  ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})

   # install configured suse init.d script
   set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")

   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
                  ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})

   # install pam profile
   set(RSERVER_PAM_DIR "extras/pam")
   set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
           DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})

   # install configured apparmor profile
   set(RSERVER_APPARMOR_DIR "extras/apparmor")

   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in
                  ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE})
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}
           DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
   install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
           DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})

   # install configured upstart profile
   set(RSERVER_UPSTART_DIR "extras/upstart")

   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
                  ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})

endif()

Lines 201-207 ProgramStatus Options::read(int argc, char * const argv[]) Link Here

(-)a/src/cpp/server/ServerOptions.cpp (-1 / +1 lines)
201		201
202	// convert relative paths by completing from the system installation	202	// convert relative paths by completing from the system installation
203	// path (this allows us to be relocatable)	203	// path (this allows us to be relocatable)
204	resolvePath(installPath, &wwwLocalPath_);	204	resolvePath(installPath.childPath(DISTRO_SHARE), &wwwLocalPath_);
205	resolvePath(installPath, &authPamHelperPath_);	205	resolvePath(installPath, &authPamHelperPath_);
206	resolvePath(installPath, &rsessionPath_);	206	resolvePath(installPath, &rsessionPath_);
207	resolvePath(installPath, &rldpathPath_);	207	resolvePath(installPath, &rldpathPath_);




   }

   // convert relative paths by completing from the app resource path
   resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_);
   resolvePath(resourcePath, &agreementFilePath_);
   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
   resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_);
   resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_);
   resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_);
   resolvePostbackPath(resourcePath, &rpostbackPath_);
#ifdef _WIN32
   resolvePath(resourcePath, &consoleIoPath_);

Return to bug 365595

Lines 314-325 core::ProgramStatus Options::read(int argc, char * const argv[]) Link Here

(-)a/src/cpp/session/SessionOptions.cpp (-5 / +5 lines)
314	}	314	}
315		315
316	// convert relative paths by completing from the app resource path	316	// convert relative paths by completing from the app resource path
317	resolvePath(resourcePath, &rResourcesPath_);	317	resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_);
318	resolvePath(resourcePath, &agreementFilePath_);	318	resolvePath(resourcePath, &agreementFilePath_);
319	resolvePath(resourcePath, &wwwLocalPath_);	319	resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
320	resolvePath(resourcePath, &coreRSourcePath_);	320	resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_);
321	resolvePath(resourcePath, &modulesRSourcePath_);	321	resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_);
322	resolvePath(resourcePath, &sessionPackagesPath_);	322	resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_);
323	resolvePostbackPath(resourcePath, &rpostbackPath_);	323	resolvePostbackPath(resourcePath, &rpostbackPath_);
324	#ifdef _WIN32	324	#ifdef _WIN32
325	resolvePath(resourcePath, &consoleIoPath_);	325	resolvePath(resourcePath, &consoleIoPath_);

Lines 142-148 if (UNIX AND NOT APPLE) Link Here

(-)a/src/cpp/server/CMakeLists.txt (-7 / +7 lines)
142	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in	142	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
143	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})	143	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
144	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}	144	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
145	DESTINATION ${RSERVER_INITD_DEBIAN_DIR})	145	DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})
146		146
147	# install configured redhat init.d script	147	# install configured redhat init.d script
148	set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")	148	set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
Lines 150-156 if (UNIX AND NOT APPLE) Link Here
150	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in	150	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
151	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})	151	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
152	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}	152	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
153	DESTINATION ${RSERVER_INITD_REDHAT_DIR})	153	DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})
154		154
155	# install configured suse init.d script	155	# install configured suse init.d script
156	set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")	156	set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
Lines 158-170 if (UNIX AND NOT APPLE) Link Here
158	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in	158	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
159	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})	159	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
160	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}	160	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
161	DESTINATION ${RSERVER_INITD_SUSE_DIR})	161	DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})
162		162
163	# install pam profile	163	# install pam profile
164	set(RSERVER_PAM_DIR "extras/pam")	164	set(RSERVER_PAM_DIR "extras/pam")
165	set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")	165	set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
166	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}	166	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
167	DESTINATION ${RSERVER_PAM_DIR})	167	DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})
168		168
169	# install configured apparmor profile	169	# install configured apparmor profile
170	set(RSERVER_APPARMOR_DIR "extras/apparmor")	170	set(RSERVER_APPARMOR_DIR "extras/apparmor")
Lines 172-180 if (UNIX AND NOT APPLE) Link Here
172	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in	172	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in
173	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE})	173	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE})
174	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}	174	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}
175	DESTINATION ${RSERVER_APPARMOR_DIR})	175	DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
176	install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load	176	install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
177	DESTINATION ${RSERVER_APPARMOR_DIR})	177	DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
178		178
179	# install configured upstart profile	179	# install configured upstart profile
180	set(RSERVER_UPSTART_DIR "extras/upstart")	180	set(RSERVER_UPSTART_DIR "extras/upstart")
Lines 182-187 if (UNIX AND NOT APPLE) Link Here
182	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in	182	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
183	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})	183	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
184	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}	184	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
185	DESTINATION ${RSERVER_UPSTART_DIR})	185	DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
186		186
187	endif()	187	endif()