[Scstudio-commits] SF.net SVN: scstudio:[274] trunk/src/view/visio

[<got...@us...>]

Revision: 274
          http://scstudio.svn.sourceforge.net/scstudio/?rev=274&view=rev
Author:   gotthardp
Date:     2009-08-20 19:57:04 +0000 (Thu, 20 Aug 2009)

Log Message:
-----------
Minor installer fixes.

Modified Paths:
--------------
    trunk/src/view/visio/addon/dllmodule.rc
    trunk/src/view/visio/addon/document.cpp
    trunk/src/view/visio/scstudio.nsi
    trunk/src/view/visio/setup-nsis/setup-nsis.vcproj

Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc	2009-07-30 07:42:42 UTC (rev 273)
+++ trunk/src/view/visio/addon/dllmodule.rc	2009-08-20 19:57:04 UTC (rev 274)
@@ -89,8 +89,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,3,0,0
- PRODUCTVERSION 0,3,0,0
+ FILEVERSION 0,3,5,0
+ PRODUCTVERSION 0,3,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x9L
@@ -107,13 +107,13 @@
         BEGIN
             VALUE "CompanyName", "Masaryk University Brno"
             VALUE "FileDescription", "Microsoft Visio add-on for design and verification of Message Sequence Charts (MSC)."
-            VALUE "FileVersion", "0.3.0"
+            VALUE "FileVersion", "0.3.5"
             VALUE "InternalName", "scstudio.vsl"
             VALUE "LegalCopyright", "(c) Petr Gotthard. All rights reserved."
             VALUE "OriginalFilename", "scstudio.vsl"
             VALUE "PrivateBuild", "$Revision$"
             VALUE "ProductName", "Sequence Chart Studio"
-            VALUE "ProductVersion", "0.3.0"
+            VALUE "ProductVersion", "0.3.5"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2009-07-30 07:42:42 UTC (rev 273)
+++ trunk/src/view/visio/addon/document.cpp	2009-08-20 19:57:04 UTC (rev 274)
@@ -440,7 +440,7 @@
   MscPtr msc = extractor.extract_msc(vsoPage);
   if(msc == NULL)
   {
-    m_reportView->Print(RS_NOTICE,
+    m_reportView->Print(RS_ERROR,
       stringize() << "Verification failed. Graphical errors in the drawing.");
     return VAORC_FAILURE;
   }

Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi	2009-07-30 07:42:42 UTC (rev 273)
+++ trunk/src/view/visio/scstudio.nsi	2009-08-20 19:57:04 UTC (rev 274)
@@ -21,7 +21,7 @@
 
 ; -- General ---------------------------
 
-!define VERSION "0.3.2"
+!define VERSION "0.3.5"
 
 Name "Sequence Chart Studio"
 OutFile "scstudio-setup-${VERSION}.exe"
@@ -147,19 +147,21 @@
   WriteRegDWORD HKCU '${RegMainPath}' 'OutputLevel' '2'
   WriteRegStr HKCU '${RegModulesPath}' 'sc_boundedness' 'scboundedness.dll'
   WriteRegStr HKCU '${RegModulesPath}' 'sc_liveness' 'scliveness.dll'
+  WriteRegStr HKCU '${RegModulesPath}' 'sc_localchoice' 'sclocalchoice.dll'
   WriteRegStr HKCU '${RegModulesPath}' 'sc_order' 'scorder.dll'
   WriteRegStr HKCU '${RegModulesPath}' 'sc_structure' 'scstructure.dll'
   WriteRegStr HKCU '${RegModulesPath}' 'sc_race' 'scrace.dll'
   WriteRegStr HKCU '${RegModulesPath}' 'sc_z120' 'scZ120.dll'
   WriteRegStr HKCU '${RegModulesPath}' 'sc_engmann' 'scengmann.dll'
   ; configure checks
+  WriteRegDWORD HKCU '${RegChecksPath}\Universal Boundedness' 'Priority' '0'
   WriteRegDWORD HKCU '${RegChecksPath}\Deadlock Free' 'Priority' '0'
   WriteRegDWORD HKCU '${RegChecksPath}\Livelock Free' 'Priority' '0'
+  WriteRegDWORD HKCU '${RegChecksPath}\Local Choice' 'Priority' '0'
   WriteRegDWORD HKCU '${RegChecksPath}\Acyclic' 'Priority' '0'
   WriteRegDWORD HKCU '${RegChecksPath}\FIFO' 'Priority' '0'
+  WriteRegDWORD HKCU '${RegChecksPath}\Unique Instance Names' 'Priority' '2'
   WriteRegDWORD HKCU '${RegChecksPath}\Race Free' 'Priority' '0'
-  WriteRegDWORD HKCU '${RegChecksPath}\Unique Instance Names' 'Priority' '2'
-  WriteRegDWORD HKCU '${RegChecksPath}\Universally Bounded' 'Priority' '0'
 
   ; Create uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"

Modified: trunk/src/view/visio/setup-nsis/setup-nsis.vcproj
===================================================================
--- trunk/src/view/visio/setup-nsis/setup-nsis.vcproj	2009-07-30 07:42:42 UTC (rev 273)
+++ trunk/src/view/visio/setup-nsis/setup-nsis.vcproj	2009-08-20 19:57:04 UTC (rev 274)
@@ -35,6 +35,7 @@
 				AdditionalDependencies="pluginapi.lib"
 				OutputFile="$(OutDir)/nsis.dll"
 				LinkIncremental="2"
+				IgnoreDefaultLibraryNames="libc.lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/nsis.pdb"
 				SubSystem="1"
@@ -82,6 +83,7 @@
 				AdditionalDependencies="pluginapi.lib"
 				OutputFile="$(OutDir)/nsis.dll"
 				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="libc.lib"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.