[Kst] branches/work/kst/portto4/kst

[Barth Netterfield]

SVN commit 1227397 by netterfield:

Fix Steve's installation/naming issues.
-Don't install unused files
  -pluging desktop files
  -colour pallets
  -kst1.x ui file
-rename kst and mimetype files



 M  +16 -21    cmake/misc/CMakeLists.txt  
 M  +1 -1      cmake/modules/KstMacros.cmake  
 M  +10 -11    cmake/src/kst/CMakeLists.txt  
 D             src/kst/kst.desktop  
 A             src/kst/kst2.desktop   src/kst/kst.desktop#1227325 [TRAILING SPACE]
 D             src/kst/kstui.rc  
 D             src/kst/x-kst.desktop  
 A             src/kst/x-kst2.desktop   src/kst/x-kst.desktop#1227325


--- branches/work/kst/portto4/kst/cmake/misc/CMakeLists.txt #1227396:1227397
@@ -39,27 +39,22 @@
 endif()
 
 
-# install data files
-if(UNIX)
-	if(NOT gyrodata)
-		configure_file(${kst_dir}/sample_data/GYRODATA+free-width+whitespace+unixEOL+dot-decimal-separator.txt.gz 
-		${CMAKE_BINARY_DIR}/gyrodata.dat.gz COPYONLY)
-		execute_process(WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND gunzip gyrodata.dat.gz)
-		set(gyrodata ${CMAKE_BINARY_DIR}/gyrodata.dat CACHE STRING "gyrodata decompressed")
-	endif()
-endif()
-file(GLOB dat_files ${kst_dir}/misc/tutorial/*.dat)
-install(FILES ${dat_files} ${gyrodata} DESTINATION ${tutorial_folder})
+# none of these are needed for now, so don't install.
+# cbn April 8, 2011
+# install data files (TODO: decide on how we want to ship tutorial/demo data)
+#if(UNIX)
+#	if(NOT gyrodata)
+#		configure_file(${kst_dir}/sample_data/GYRODATA+free-width+whitespace+unixEOL+dot-decimal-separator.txt.gz 
+#		${CMAKE_BINARY_DIR}/gyrodata.dat.gz COPYONLY)
+#		execute_process(WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND gunzip gyrodata.dat.gz)
+#		set(gyrodata ${CMAKE_BINARY_DIR}/gyrodata.dat CACHE STRING "gyrodata decompressed")
+#	endif()
+#endif()
+#file(GLOB dat_files ${kst_dir}/misc/tutorial/*.dat)
+#install(FILES ${dat_files} ${gyrodata} DESTINATION ${tutorial_folder})
 
 
-# install colors
-file(GLOB idl_files ${kst_dir}/misc/IDL*)
-install(FILES ${idl_files} DESTINATION ${color_folder})
+# install colors (TODO: support reading color pallets from disk)
+#file(GLOB idl_files ${kst_dir}/misc/IDL*)
+#install(FILES ${idl_files} DESTINATION ${color_folder})
 
-
-#install fonts
-if(UNIX)
-	file(GLOB fonts ${kst_dir}/misc/fonts/*.gz)
-	install(FILES ${fonts} DESTINATION ${font_folder})
-endif()
-
--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1227396:1227397
@@ -156,7 +156,7 @@
 	kst_link(${libcore} ${libmath} ${libwidgets})
 	if(NOT APPLE)
 		install(TARGETS ${kst_name} LIBRARY DESTINATION ${kst_install_plugins})
-		kst_find_install_desktop_file(${kst_plugin_dir}/${folder}/${name})
+#		kst_find_install_desktop_file(${kst_plugin_dir}/${folder}/${name})
 	endif()
 	add_dependencies(${kst_binary_name} ${kst_name})
 	kst_flat_source_group(${kst_${kst_name}_headers} ${kst_${kst_name}_sources_not_generated})
--- branches/work/kst/portto4/kst/cmake/src/kst/CMakeLists.txt #1227396:1227397
@@ -42,15 +42,14 @@
 	install(FILES ${man}.gz DESTINATION share/man/man1)
 	
 	set(k ${kst_dir}/src/kst)
-	install(FILES ${k}/kstplugin.desktop
-	              ${k}/kstdatasourceplugin.desktop
-	              ${k}/kstdataobjectplugin.desktop
-	              ${k}/kstbasicplugin.desktop
-	              ${k}/kstfilter.desktop
-	              ${k}/kstextension.desktop
-	                                 DESTINATION share/servicetypes/kst)
-	install(FILES ${k}/kst.desktop   DESTINATION share/applnk/Graphics)
-	install(FILES ${k}/kstui.rc      DESTINATION share/apps/kst)
-	install(FILES ${k}/x-kst.desktop DESTINATION share/mimelink/application)
-	install(FILES ${k}/kst.desktop   DESTINATION share/applications)
+#	install(FILES ${k}/kstplugin.desktop
+#	              ${k}/kstdatasourceplugin.desktop
+#	              ${k}/kstdataobjectplugin.desktop
+#	              ${k}/kstbasicplugin.desktop
+#	              ${k}/kstfilter.desktop
+#	              ${k}/kstextension.desktop
+#	                                 DESTINATION share/servicetypes/kst)
+	install(FILES ${k}/kst2.desktop   DESTINATION share/applnk/Graphics)
+	install(FILES ${k}/x-kst2.desktop DESTINATION share/mimelink/application)
+	install(FILES ${k}/kst2.desktop   DESTINATION share/applications)
 endif()