Attachment #284159 for bug #365595

Lines 98-104 Link Here

(-)CMakeGlobals.txt (-1 / +1 lines)
98	else()	98	else()
99	set(RSTUDIO_INSTALL_BIN bin)	99	set(RSTUDIO_INSTALL_BIN bin)
100	endif()	100	endif()
101	set(RSTUDIO_INSTALL_SUPPORTING .)	101	set(RSTUDIO_INSTALL_SUPPORTING ./share/rstudio-0.94.92/)
102	endif()	102	endif()
103		103
104	# if the install prefix is /usr/local then tweak as appropriate	104	# 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 share/rstudio-0.94.92/${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 share/rstudio-0.94.92/${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 share/rstudio-0.94.92/${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 share/rstudio-0.94.92/${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 share/rstudio-0.94.92/${RSERVER_APPARMOR_DIR})
   install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
           DESTINATION share/rstudio-0.94.92/${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 share/rstudio-0.94.92/${RSERVER_UPSTART_DIR})

endif()

Lines 206-212 Link Here

(-)src/cpp/server/ServerOptions.cpp (-1 / +1 lines)
206		206
207	// convert relative paths by completing from the system installation	207	// convert relative paths by completing from the system installation
208	// path (this allows us to be relocatable)	208	// path (this allows us to be relocatable)
209	resolvePath(installPath, &wwwLocalPath_);	209	resolvePath(installPath.childPath("share/rstudio-0.94.92"), &wwwLocalPath_);
210	resolvePath(installPath, &authPamHelperPath_);	210	resolvePath(installPath, &authPamHelperPath_);
211	resolvePath(installPath, &rsessionPath_);	211	resolvePath(installPath, &rsessionPath_);
212	resolvePath(installPath, &rldpathPath_);	212	resolvePath(installPath, &rldpathPath_);




   }

   // convert relative paths by completing from the app resource path
   resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &rHelpCssFilePath_);
   resolvePath(resourcePath, &agreementFilePath_);
   resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &wwwLocalPath_);
   resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &coreRSourcePath_);
   resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &modulesRSourcePath_);
   resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &sessionPackagesPath_);
   resolvePath(resourcePath, &rpostbackPath_);

   // shared secret with parent

Return to bug 365595

Lines 272-283 Link Here

(-)src/cpp/session/SessionOptions.cpp (-5 / +5 lines)
272	}	272	}
273		273
274	// convert relative paths by completing from the app resource path	274	// convert relative paths by completing from the app resource path
275	resolvePath(resourcePath, &rHelpCssFilePath_);	275	resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &rHelpCssFilePath_);
276	resolvePath(resourcePath, &agreementFilePath_);	276	resolvePath(resourcePath, &agreementFilePath_);
277	resolvePath(resourcePath, &wwwLocalPath_);	277	resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &wwwLocalPath_);
278	resolvePath(resourcePath, &coreRSourcePath_);	278	resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &coreRSourcePath_);
279	resolvePath(resourcePath, &modulesRSourcePath_);	279	resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &modulesRSourcePath_);
280	resolvePath(resourcePath, &sessionPackagesPath_);	280	resolvePath(resourcePath.childPath("share/rstudio-0.94.92"), &sessionPackagesPath_);
281	resolvePath(resourcePath, &rpostbackPath_);	281	resolvePath(resourcePath, &rpostbackPath_);
282		282
283	// shared secret with parent	283	// shared secret with parent

Lines 150-156 Link Here

(-)src/cpp/server/CMakeLists.txt (-7 / +7 lines)
150	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in	150	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
151	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})	151	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
152	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}	152	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
153	DESTINATION ${RSERVER_INITD_DEBIAN_DIR})	153	DESTINATION share/rstudio-0.94.92/${RSERVER_INITD_DEBIAN_DIR})
154		154
155	# install configured redhat init.d script	155	# install configured redhat init.d script
156	set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")	156	set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
Lines 158-164 Link Here
158	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in	158	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
159	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})	159	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
160	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}	160	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
161	DESTINATION ${RSERVER_INITD_REDHAT_DIR})	161	DESTINATION share/rstudio-0.94.92/${RSERVER_INITD_REDHAT_DIR})
162		162
163	# install configured suse init.d script	163	# install configured suse init.d script
164	set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")	164	set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
Lines 166-178 Link Here
166	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in	166	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
167	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})	167	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
168	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}	168	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
169	DESTINATION ${RSERVER_INITD_SUSE_DIR})	169	DESTINATION share/rstudio-0.94.92/${RSERVER_INITD_SUSE_DIR})
170		170
171	# install pam profile	171	# install pam profile
172	set(RSERVER_PAM_DIR "extras/pam")	172	set(RSERVER_PAM_DIR "extras/pam")
173	set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")	173	set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
174	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}	174	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
175	DESTINATION ${RSERVER_PAM_DIR})	175	DESTINATION share/rstudio-0.94.92/${RSERVER_PAM_DIR})
176		176
177	# install configured apparmor profile	177	# install configured apparmor profile
178	set(RSERVER_APPARMOR_DIR "extras/apparmor")	178	set(RSERVER_APPARMOR_DIR "extras/apparmor")
Lines 180-188 Link Here
180	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in	180	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in
181	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE})	181	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE})
182	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}	182	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}
183	DESTINATION ${RSERVER_APPARMOR_DIR})	183	DESTINATION share/rstudio-0.94.92/${RSERVER_APPARMOR_DIR})
184	install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load	184	install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
185	DESTINATION ${RSERVER_APPARMOR_DIR})	185	DESTINATION share/rstudio-0.94.92/${RSERVER_APPARMOR_DIR})
186		186
187	# install configured upstart profile	187	# install configured upstart profile
188	set(RSERVER_UPSTART_DIR "extras/upstart")	188	set(RSERVER_UPSTART_DIR "extras/upstart")
Lines 190-195 Link Here
190	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in	190	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
191	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})	191	${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
192	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}	192	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
193	DESTINATION ${RSERVER_UPSTART_DIR})	193	DESTINATION share/rstudio-0.94.92/${RSERVER_UPSTART_DIR})
194		194
195	endif()	195	endif()