Commit 43b20622 authored by Joseph Pallamidessi's avatar Joseph Pallamidessi

Minor aesthetic changes

parent 3c1f3c0a
......@@ -1518,7 +1518,6 @@ if( bGPOPCODE_ANALYSIS )printf("\n");lineCounter++;
{
#line 1109 "EaseaLex.l"
printf("evaluator insert\n");
yyreset();
yyin = fpGenomeFile; // switch to .ez file and analyser
lineCounter=1;
......
......@@ -1628,6 +1628,7 @@ int main(int argc, char *argv[]){
char *sTemp;
int i=0;
printf("Easea v1.0.3 compiler \n");
TARGET=STD;
bVERBOSE=0;
sRAW_PROJECT_NAME[0]=0; // used to ask for a filename if no filename is found on the command line.
......
......@@ -80,18 +80,23 @@ install:vars
cp boost/program_options.a /usr/local/easea/boost
cp -r boost/boost/ /usr/local/easea/boost/boost/
cp easeagrapher/EaseaGrapher.jar /usr/local/easea/easeagrapher/
vars:
vars:profile_
ifeq ($(UNAME), Darwin)
@sed '/EZ_PATH/d' $(HOME)/.bash_profile>$(HOME)/.bash_profile_save
@mv $(HOME)/.bash_profile_save $(HOME)/.bash_profile
@echo "export EZ_PATH=/usr/local/easea/">>$(HOME)/.bash_profile
@echo "export PATH=\$$PATH:/usr/local/easea/bin:" >>$(HOME)/.bash_profile
@echo "export EZ_PATH=/usr/local/easea/">>$PROFILE
@echo "export PATH=\$$PATH:/usr/local/easea/bin:" >>$PROFILE
else
@echo "\nexport EZ_PATH=/usr/local/easea/">>$(HOME)/.bashrc
@echo "export PATH=\$$PATH:/usr/local/easea/bin:" >>$(HOME)/.bashrc
@echo "PATH and EZ_PATH variables have been set"
endif
profile_:
ifeq ($(wildcard "$(HOME)/.profile"),)
PROFILE="$(HOME)/.bash_profile"
else
PROFILE="$(HOME)/.profile"
endif
build:
@test -d build || mkdir build || echo "Cannot make dir build"
bin:
......
......@@ -612,7 +612,10 @@ void ParametersImpl::setDefaultParameters(int argc, char** argv){
this->plotOutputFilename = (char*)"EASEA.png";
this->remoteIslandModel = setVariable("remoteIslandModel",\REMOTE_ISLAND_MODEL);
this->ipFile = (char*)setVariable("ipFile","\IP_FILE").c_str();
std::string* ipFilename=new std::string();
*ipFilename=setVariable("ipFile","\IP_FILE");
this->ipFile =(char*)ipFilename->c_str();
this->migrationProbability = setVariable("migrationProbability",(float)\MIGRATION_PROBABILITY);
this->serverPort = setVariable("serverPort",\SERVER_PORT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment