v1.2 confirm epublib, change immediate dir

hustlei · Jan 11, 2016 · dfc691c · dfc691c
1 parent 8c65b7a
commit dfc691c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/src/EpubLib/EpubLib.csproj b/src/EpubLib/EpubLib.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\win\bind\</OutputPath>
-    <BaseIntermediateOutputPath>..\..\win\objd\$(ProjectName)</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath>..\..\win\objd\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\win\bin\</OutputPath>
-    <BaseIntermediateOutputPath>..\..\win\obj\$(ProjectName)</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath>..\..\win\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/src/EpubLib/Properties/AssemblyInfo.cs b/src/EpubLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.1549")]
+[assembly: AssemblyVersion("1.1.0.1551")]
 [assembly: AssemblyFileVersion("1.1.0.1408")]
diff --git a/src/EpubLib/ReadMe.md b/src/EpubLib/ReadMe.md
@@ -14,6 +14,9 @@ EpubLib内仅包含一个类EpubBook，可以读取一个Epub文件，EpubBook
     - CloseFile():关闭文档，清空所有属性，删除缓存文档，在程序关闭前必须调用该函数，否则会占用系统临时目录空间。
 + 属性:
     - TreeNode TreeNode:Epub目录树
+		* name属性存储url
+		* text属性存储章节/文章名称
+        * ImageIndex存储图标序号
     - static ImageList ImageList;按顺序存储文件夹图标、打开的文件夹图标、文件图标
     - bool IsSpine;是否读取顺序阅读目录，默认为否
     - string Filename：文件名称

diff --git a/src/EpubViewer/EpubViewer.csproj b/src/EpubViewer/EpubViewer.csproj
@@ -35,7 +35,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\win\bind\</OutputPath>
-    <BaseIntermediateOutputPath>..\..\win\objd\$(ProjectName)</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath>..\..\win\objd\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -45,7 +45,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\win\bin\</OutputPath>
-    <BaseIntermediateOutputPath>..\..\win\obj\$(ProjectName)</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath>..\..\win\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/src/EpubViewer/Properties/AssemblyInfo.cs b/src/EpubViewer/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.1533")]
+[assembly: AssemblyVersion("1.1.0.1534")]
 [assembly: AssemblyFileVersion("1.1.0.1408")]
diff --git a/src/MordenWin/MordenWin.csproj b/src/MordenWin/MordenWin.csproj
@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\win\bind\</OutputPath>
-    <BaseIntermediateOutputPath>..\..\win\objd\$(ProjectName)</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath>..\..\win\objd\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\win\bin\</OutputPath>
-    <BaseIntermediateOutputPath>..\..\win\objd\$(ProjectName)</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath>..\..\win\objd\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/src/rc4net/rc4net.vcxproj b/src/rc4net/rc4net.vcxproj
@@ -42,12 +42,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\win\bind\</OutDir>
-    <IntDir>..\..\win\objd\$(ProjectName)</IntDir>
+    <IntDir>..\..\win\objd\$(MSBuildProjectName)</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\win\bin\</OutDir>
-    <IntDir>..\..\win\obj\$(ProjectName)</IntDir>
+    <IntDir>..\..\win\obj\$(MSBuildProjectName)</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>