#388 Copying includes and etc data did not work across platforms

cortoproject · Nov 1, 2015 · f5ddc9c · f5ddc9c
1 parent 6488bad
commit f5ddc9c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/build/library.rb b/build/library.rb
@@ -76,20 +76,21 @@
 end
 
 task :collect do
-	verbose(true)
+	verbose(false)
 	if File.exists?("include") then
 		if TARGET != "corto" then
-			includePath = "#{ENV['CORTO_TARGET']}/include/corto/#{VERSION}/#{TARGETPATH}"
+			includePath = "#{ENV['HOME']}/.corto/pack/include/corto/#{VERSION}/#{TARGETPATH}"
 		else
-			includePath = "#{ENV['CORTO_TARGET']}/include/corto/#{VERSION}/packages/corto/lang"
+			includePath = "#{ENV['HOME']}/.corto/pack/include/corto/#{VERSION}/packages/corto/lang"
 		end
 		sh "mkdir -p #{includePath}"
 	    sh "cp include/* #{includePath}/"
 	end	
 	if File.exists?("etc") then
-		etc = ENV['HOME'] + "/.corto/pack/etc/corto/#{VERSION}/#{TARGETPATH}"
+		etc = "#{ENV['HOME']}/.corto/pack/etc/corto/#{VERSION}/#{TARGETPATH}"
+		targetEtc = "#{ENV['CORTO_TARGET']}/etc/corto/#{VERSION}/#{TARGETPATH}"
 		sh "mkdir -p #{etc}"
-	    sh "cp -r etc/* #{etc}/"
+	    sh "cp -r #{targetEtc}/* #{etc}/"
 	end	
 end
 

diff --git a/generators/html/src/html.c b/generators/html/src/html.c
@@ -308,6 +308,7 @@ static corto_int16 corto_ser_memberDetail(corto_serializer s, corto_value *info,
     g_file file = userData;
     corto_member m = info->is.member.t;
     corto_string description = doc_getDescription(m);
+    corto_string text = doc_getText(m);
     corto_id path;
     corto_id id;
 
@@ -343,6 +344,9 @@ static corto_int16 corto_ser_memberDetail(corto_serializer s, corto_value *info,
     }
     g_fileWrite(file, "</table>\n");
     g_fileWrite(file, "</td></tr>\n");
+    if (text) {
+        g_fileWrite(file, "<p>%s</p>\n", text);
+    }
 
     return 0;
 }

diff --git a/packages/corto/lang/src/corto.c b/packages/corto/lang/src/corto.c
@@ -37,7 +37,7 @@ struct corto_exitHandler {
 
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "2"
-#define VERSION_PATCH "4"
+#define VERSION_PATCH "5"
 #define VERSION_SUFFIX "alpha"
 
 #ifdef VERSION_SUFFIX

diff --git a/tools/corto/src/cortotool_install.c b/tools/corto/src/cortotool_install.c
@@ -54,11 +54,6 @@ static corto_int16 cortotool_installFromSource(void) {
 		fprintf(install, "mv -f /usr/local/bin/corto /usr/local/bin/corto.%s\n", version);
 		fprintf(install, "ln -s /usr/local/bin/corto.%s /usr/local/bin/corto\n", version);
 		fprintf(install, "rc=$?; if [ $rc != 0 ]; then exit $rc; fi\n");
-
-		/* Rename libcorto.so */
-		fprintf(install, "mv -f /usr/local/lib/libcorto.so /usr/local/lib/libcorto.so.%s\n", version);
-		fprintf(install, "ln -s /usr/local/lib/libcorto.so.%s /usr/local/lib/libcorto.so\n", version);
-		fprintf(install, "rc=$?; if [ $rc != 0 ]; then exit $rc; fi\n");
 	}
 
 	fprintf(install, "rake clean 2> /dev/null\n");