matlab demo quick start

CMakeLists.txt

@@ -342,6 +342,7 @@ if (BUILD_MATLAB_MEX_FILES)
 	set(FAUST_DEMO_TOOLS_SRC_DIR 	${FAUST_DEMO_SRC_DIR}/tools CACHE INTERNAL "")
 	set(FAUST_DEMO_HADAMARD_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Hadamard_factorization CACHE INTERNAL "")
 	set(FAUST_DEMO_TIMECOMP_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Runtime_comparison CACHE INTERNAL "")
+	set(FAUST_DEMO_QUICKSTART_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Quick_start CACHE INTERNAL "")
 
 	###### BIN DIRECTORY ######
 	set(FAUST_DEMO_BIN_DIR 		${FAUST_MATLAB_BIN_DIR}/demo CACHE INTERNAL "")
@@ -353,6 +354,7 @@ if (BUILD_MATLAB_MEX_FILES)
 	set(FAUST_DEMO_HADAMARD_OUTPUT_BIN_DIR 	${FAUST_DEMO_HADAMARD_BIN_DIR}/output/ CACHE INTERNAL "")
 	set(FAUST_DEMO_TIMECOMP_BIN_DIR ${FAUST_DEMO_BIN_DIR}/Runtime_comparison CACHE INTERNAL "")
 	set(FAUST_DEMO_FIG_BIN_DIR ${FAUST_DEMO_BIN_DIR}/Figures CACHE INTERNAL "")
+	set(FAUST_DEMO_QUICKSTART_BIN_DIR ${FAUST_DEMO_BIN_DIR}/Quick_start CACHE INTERNAL "")
 	
 
 	####  INSTALL DIRECTORY ####
@@ -365,6 +367,7 @@ if (BUILD_MATLAB_MEX_FILES)
 	set(FAUST_DEMO_HADAMARD_OUTPUT_INSTALL_DIR 	${FAUST_DEMO_HADAMARD_INSTALL_DIR}/output/ CACHE INTERNAL "")
 	set(FAUST_DEMO_TIMECOMP_INSTALL_DIR 		${FAUST_DEMO_INSTALL_DIR}/Runtime_comparison CACHE INTERNAL "")
 	set(FAUST_DEMO_FIG_INSTALL_DIR 				${FAUST_DEMO_INSTALL_DIR}/Figures CACHE INTERNAL "")
+	set(FAUST_DEMO_QUICKSTART_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/Quick_start CACHE INTERNAL "")
 
 	file(MAKE_DIRECTORY ${FAUST_DEMO_INSTALL_DIR})
 	file(MAKE_DIRECTORY ${FAUST_DEMO_BSL_INSTALL_DIR})
@@ -375,6 +378,7 @@ if (BUILD_MATLAB_MEX_FILES)
 	file(MAKE_DIRECTORY ${FAUST_DEMO_HADAMARD_OUTPUT_INSTALL_DIR})
 	file(MAKE_DIRECTORY ${FAUST_DEMO_TIMECOMP_INSTALL_DIR})
 	file(MAKE_DIRECTORY ${FAUST_DEMO_FIG_INSTALL_DIR})
+	file(MAKE_DIRECTORY ${FAUST_DEMO_QUICKSTART_INSTALL_DIR})
 endif(BUILD_MATLAB_MEX_FILES)
 ##################################################################
 

misc/demo/CMakeLists.txt

@@ -41,6 +41,13 @@ if(BUILD_MATLAB_MEX_FILES)
       		install(FILES ${FAUST_DEMO_TIMECOMP_BIN_DIR}/${matlab_script} DESTINATION ${FAUST_DEMO_TIMECOMP_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 	endforeach()
 	
+	##### Quick Start ##############################################
+	configure_file(${FAUST_DEMO_QUICKSTART_SRC_DIR}/quick_start.m ${FAUST_DEMO_QUICKSTART_BIN_DIR}/quick_start.m COPYONLY)
+      	install(FILES ${FAUST_DEMO_QUICKSTART_BIN_DIR}/quick_start.m DESTINATION ${FAUST_DEMO_QUICKSTART_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+
+	configure_file(${FAUST_DATA_MAT_DIR}/faust_quick_start.mat ${FAUST_DEMO_QUICKSTART_BIN_DIR}/faust_quick_start.mat COPYONLY)
+      	install(FILES ${FAUST_DEMO_QUICKSTART_BIN_DIR}/faust_quick_start.mat DESTINATION ${FAUST_DEMO_QUICKSTART_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+	
 	
 	#################### Tools directory ############################
 	file(GLOB TOOLS_MATLAB_SCRIPTS RELATIVE ${FAUST_DEMO_TOOLS_SRC_DIR}  "${FAUST_DEMO_TOOLS_SRC_DIR}/*.m")

wrapper/matlab/CMakeLists.txt

@@ -6,11 +6,17 @@
 # copy and install the matlab wrapping the underlying C++ class
 
 file(MAKE_DIRECTORY ${FAUST_MATLAB_TOOLS_INSTALL_DIR})
-foreach(MATLAB_FILE Faust FaustCore)
-	configure_file(${FAUST_MATLAB_TOOLS_SRC_DIR}/${MATLAB_FILE}.m ${FAUST_MATLAB_TOOLS_BIN_DIR}/${MATLAB_FILE}.m COPYONLY)
-	install(FILES ${FAUST_MATLAB_TOOLS_BIN_DIR}/${MATLAB_FILE}.m DESTINATION ${FAUST_MATLAB_TOOLS_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+
+# matlab tools directory
+foreach(MATLAB_TOOLS FaustCore)
+	configure_file(${FAUST_MATLAB_TOOLS_SRC_DIR}/${MATLAB_TOOLS}.m ${FAUST_MATLAB_TOOLS_BIN_DIR}/${MATLAB_TOOLS}.m COPYONLY)
+	install(FILES ${FAUST_MATLAB_TOOLS_BIN_DIR}/${MATLAB_TOOLS}.m DESTINATION ${FAUST_MATLAB_TOOLS_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 endforeach()
 
+# install Faust.m in the  CMAKE_INSTALL_MATLAB_PREFIX directory
+	configure_file(${FAUST_MATLAB_SRC_DIR}/Faust.m ${FAUST_MATLAB_BIN_DIR}/Faust.m COPYONLY)
+	install(FILES ${FAUST_MATLAB_BIN_DIR}/Faust.m DESTINATION ${CMAKE_INSTALL_MATLAB_PREFIX} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+
 
 
 file(GLOB CPP_MEXTOOLS_FILES "${FAUST_MATLAB_TOOLS_SRC_DIR}/*.cpp")

wrapper/matlab/setup_FAUST.m.in

@@ -39,34 +39,20 @@
 
 ROOT_DIR=[fileparts(mfilename('fullpath')),filesep];
 
-relpathlist={'',...
-                  'mex',... %% mexfunction access (mexHierarchical_fact, mexPalm4MSA, mexFaust )        
-		  'tools',... %% Faust.m		
-                  'demo',... 
-	          'demo/Brain_source_localization',...
-		  'demo/Hadamard_factorization',...
-		  'demo/Runtime_comparison',...  	
-                 };
+
              
 fprintf('Welcome to wrapper matlab C++ FAuST_toolbox. FAuST root directory is %s\n',ROOT_DIR);
-for k=1:numel(relpathlist)
+fprintf('adding path %s\n and all its subdirectories ',ROOT_DIR);
+addpath(genpath(ROOT_DIR));
 
-    
-    tmp_pathname=[ROOT_DIR,relpathlist{k}];
-  fprintf('adding path %s\n',tmp_pathname);
-  addpath(genpath(tmp_pathname));
-end
-cd(ROOT_DIR)
-clear relpathlist tmp_pathname ROOT_DIR k
 
 
 
 
 
-fprintf('\n FAuST is successfully installed. \n')
-fprintf(['\n To get started with the FAuST Toolbox : \n'])
-fprintf(['\n launch run_all_demo.m \n'])
 
 
+fprintf(['\n\n To get started with the FAuST Toolbox : \n'])
+fprintf(['\n launch quick_start or run_all_demo.m \n'])