Unverified Commit 791c8d0e authored by jayd1860's avatar jayd1860 Committed by GitHub
Browse files

Merge pull request #68 from BUNPC/development 

-- Minor updates to build and installation process for MAC
parents 975eb0d0 a306e804

Install/Buildme_Setup.m

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ end 
if exist(dirnameInstall,'dir')

    cd(dirnameInstall);

end

Buildme('setup');

Buildexe('setup');

cd(currdir);

Install/createInstallFile.m

+1 −1
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ mkdir([dirnameInstall, 'homer3_install/SubjDataSample']); 


% Generate executables

if ~strcmp(options, 'nobuild')

	Buildme();

	Buildme_Setup();

	Buildme();

    if islinux()

        perl('./makesetup.pl','./run_setup.sh','./setup.sh');

    elseif ismac()

Install/finishInstallGUI.m

+2 −1
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ varargout{1} = stats.err; 
function pushbuttonOK_Callback(hObject, eventdata, handles)

global stats



fprintf('Completing Installation ...\n');

stats.pushbuttonOKPress = true;



delete(stats.handles.this);
 
delete(handles.figure1);

Install/setup.m

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ close(h); 


cleanup();



deleteNamespace('Homer3')

CRA Git | Maintained and supported by SUSTech CRA and CCSE