Skip to content

Commit

Permalink
Merge pull request logrhythm#137 from kjell-hedstrom/2.3.1__bugfix_ma…
Browse files Browse the repository at this point in the history
…pqosmos

created directories in the wrong order with aspect to script execution
  • Loading branch information
Kjell committed Mar 7, 2014
2 parents 3a2faa8 + 2054f7b commit 2f8e0af
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion scripts/buildProtoFiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ if [ ! -f "$phpprotoc" ]; then
sh "$scriptsDir"/getPhpProtobuffers.sh
fi

mkdir -p "$cppSrcDir"/liblrdpi "$cppSrcDir"/libstats "$cppSrcDir"/libconf $cppSrcDir/libcommand "$cppSrcDir"/libprocess "$cppSrcDir"/liblua "$cppSrcDir"/libtools "$cppSrcDir"/libfork

cp "$protoFileDir"/DpiMsgLRproto.proto "$protoFileDir"/DpiMsgLRproto.proto.orig
cp "$protoFileDir"/Applications.proto "$protoFileDir"/Applications.proto.orig
sh "$scriptsDir"/buildDpiMsgLRProto.sh > "$protoFileDir"/DpiMsgLRproto.proto
Expand All @@ -47,7 +49,6 @@ for file in `ls "$protoFileDir" | grep -v DpiMsgLRproto | grep -v Applications`
done
cd "$startDir"

mkdir -p "$cppSrcDir"/liblrdpi "$cppSrcDir"/libstats "$cppSrcDir"/libconf $cppSrcDir/libcommand "$cppSrcDir"/libprocess "$cppSrcDir"/liblua "$cppSrcDir"/libtools "$cppSrcDir"/libfork
cd "$cppSrcDir"
"$protoc" -I="$protoFileDir" --cpp_out=liblrdpi "$protoFileDir"/DpiMsgLRproto.proto
"$protoc" -I="$protoFileDir" --cpp_out=liblrdpi "$protoFileDir"/Applications.proto
Expand Down

0 comments on commit 2f8e0af

Please sign in to comment.