Attachment #287587 for bug #365595

Lines 98-104 Link Here

(-)prefs/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.106/)
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.106/${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.106/${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.106/${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.106/${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.106/${RSERVER_APPARMOR_DIR})
   install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
           DESTINATION share/rstudio-0.94.106/${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.106/${RSERVER_UPSTART_DIR})

endif()

Lines 201-207 Link Here

(-)prefs/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("share/rstudio-0.94.106"), &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("share/rstudio-0.94.106"), &rHelpCssFilePath_);
   resolvePath(resourcePath, &agreementFilePath_);
   resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &wwwLocalPath_);
   resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &coreRSourcePath_);
   resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &modulesRSourcePath_);
   resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &sessionPackagesPath_);
   resolvePath(resourcePath, &rpostbackPath_);

   // shared secret with parent

Return to bug 365595

Lines 272-283 Link Here

(-)prefs/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.106"), &rHelpCssFilePath_);
276	resolvePath(resourcePath, &agreementFilePath_);	276	resolvePath(resourcePath, &agreementFilePath_);
277	resolvePath(resourcePath, &wwwLocalPath_);	277	resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &wwwLocalPath_);
278	resolvePath(resourcePath, &coreRSourcePath_);	278	resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &coreRSourcePath_);
279	resolvePath(resourcePath, &modulesRSourcePath_);	279	resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &modulesRSourcePath_);
280	resolvePath(resourcePath, &sessionPackagesPath_);	280	resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &sessionPackagesPath_);
281	resolvePath(resourcePath, &rpostbackPath_);	281	resolvePath(resourcePath, &rpostbackPath_);
282		282
283	// shared secret with parent	283	// shared secret with parent

Lines 141-147 Link Here

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