- Timestamp:
- Apr 6, 2008, 10:03:28 PM (17 years ago)
- Location:
- trunk/ab5.0
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0
- Property svn:externals
-
old new 4 4 abdev/build/debug/system http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/system 5 5 abdev/build/debug/theme http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/theme 6 abdev/build/release/ablib http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/ablib 7 abdev/build/release/runtime http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/runtime 8 abdev/build/release/system http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/system 9 abdev/build/release/theme http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/theme 6 abdev/build/release http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0
-
- Property svn:externals
-
trunk/ab5.0/abdev/BasicCompiler64/BasicCompiler.vcproj
r477 r480 240 240 RelativePathToProject="..\jenga\projects\jenga\jenga.vcproj" 241 241 /> 242 <ProjectReference 243 ReferencedProjectIdentifier="{87835C33-64C9-4BA5-9B39-608BA5394387}" 244 RelativePathToProject=".\ab_common\ab_common.vcproj" 245 /> 242 246 </References> 243 247 <Files> -
trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp
r477 r480 251 251 252 252 hFile=CreateFile( 253 ( Jenga::Common::Environment::GetAppDir() + "\\pgm.tmp" ).c_str(),253 ( ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\pgm.tmp" ).c_str(), 254 254 GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL); 255 255 WriteFile(hFile,FileName,lstrlen(FileName),&dw,NULL); … … 681 681 { 682 682 // インクルードディレクトリを絶対パスに変更 683 program.SetIncludeDir( Jenga::Common::Path::MakeFullPath ( program.GetIncludeDir(), ActiveBasic::Common::Environment::GetAbdevRootPath() ) );683 program.SetIncludeDir( Jenga::Common::Path::MakeFullPathByCurrentDirectory( program.GetIncludeDir() ) ); 684 684 } 685 685 686 686 // ソースファイル名を絶対パスに変換 687 program.SetSourceFilePath( Jenga::Common::Path::MakeFullPath ( program.GetSourceFilePath(), baseDirPath) );687 program.SetSourceFilePath( Jenga::Common::Path::MakeFullPathByCurrentDirectory( program.GetSourceFilePath() ) ); 688 688 689 689 // 出力ファイル名を絶対パスに変換 690 program.SetOutputFilePath( Jenga::Common::Path::MakeFullPath ( program.GetOutputFilePath(), baseDirPath) );690 program.SetOutputFilePath( Jenga::Common::Path::MakeFullPathByCurrentDirectory( program.GetOutputFilePath() ) ); 691 691 692 692 // モジュール名をセット … … 707 707 DWORD dwAccessBytes; 708 708 hFile=CreateFile( 709 ( Jenga::Common::Environment::GetAppDir() + "\\pgm.tmp" ).c_str(),709 ( ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\pgm.tmp" ).c_str(), 710 710 GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 711 711 if(hFile!=INVALID_HANDLE_VALUE){ -
trunk/ab5.0/abdev/BasicCompiler_Common/src/Messenger.cpp
r472 r480 471 471 472 472 hFile=CreateFile( 473 ( Jenga::Common::Environment::GetAppDir() + "\\pgm.tmp" ).c_str(),473 ( ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\pgm.tmp" ).c_str(), 474 474 GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL); 475 475 WriteFile(hFile,FileName,lstrlen(FileName),&dw,NULL); -
trunk/ab5.0/abdev/ProjectEditor/NonVolatile.cpp
r475 r480 444 444 445 445 //インクルードディレクトリ 446 if(!GetStringValue("IncludeDir",szIncludeDir)) lstrcpy(szIncludeDir,". .\\Include\\");446 if(!GetStringValue("IncludeDir",szIncludeDir)) lstrcpy(szIncludeDir,".\\ablib\\src"); 447 447 448 448 HeapDefaultFree(buffer); … … 550 550 551 551 //インクルードディレクトリ 552 lstrcpy(szIncludeDir,". .\\Include\\");552 lstrcpy(szIncludeDir,".\\ablib\\src"); 553 553 554 554 //ウィンドウ位置、サイズ -
trunk/ab5.0/abdev/ProjectEditor/NonVolatile.h
r80 r480 103 103 //インクルードディレクトリ 104 104 char szIncludeDir[MAX_PATH]; 105 std::string GetIncludeDirFullPath() 106 { 107 return Jenga::Common::Path::MakeFullPath( szIncludeDir, ActiveBasic::Common::Environment::GetAbdevRootPath() ); 108 } 105 109 106 110 ////////////////////////////////////////////////////////////// -
trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.cpp
r477 r480 2079 2079 2080 2080 //インクルードディレクトリ 2081 sprintf(temp2," /include_dir:\"%s\"",pobj_nv-> szIncludeDir);2081 sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str()); 2082 2082 lstrcat(temporary,temp2); 2083 2083 … … 2129 2129 2130 2130 //インクルードディレクトリ 2131 sprintf(temp2," /include_dir:\"%s\"",pobj_nv-> szIncludeDir);2131 sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str()); 2132 2132 lstrcat(temporary,temp2); 2133 2133 … … 2160 2160 2161 2161 //インクルードディレクトリ 2162 sprintf(temp2," /include_dir:\"%s\"",pobj_nv-> szIncludeDir);2162 sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str()); 2163 2163 lstrcat(temporary,temp2); 2164 2164 … … 2224 2224 2225 2225 //インクルードディレクトリ 2226 sprintf(temp2," /include_dir:\"%s\"",pobj_nv-> szIncludeDir);2226 sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str()); 2227 2227 lstrcat(temporary,temp2); 2228 2228 … … 2263 2263 2264 2264 //インクルードディレクトリ 2265 sprintf(temp2," /include_dir:\"%s\"",pobj_nv-> szIncludeDir);2265 sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str()); 2266 2266 lstrcat(temporary,temp2); 2267 2267 -
trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.vcproj
r477 r480 52 52 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;.\include" 53 53 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;THETEXT;WINVER=0x0501;_WIN32_WINNT=0x0501" 54 StringPooling=" true"54 StringPooling="false" 55 55 RuntimeLibrary="0" 56 EnableFunctionLevelLinking=" true"56 EnableFunctionLevelLinking="false" 57 57 UsePrecompiledHeader="2" 58 58 PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch" … … 63 63 WarningLevel="3" 64 64 SuppressStartupBanner="true" 65 DebugInformationFormat="3" 65 66 /> 66 67 <Tool … … 357 358 WarningLevel="3" 358 359 SuppressStartupBanner="true" 359 DebugInformationFormat=" 4"360 DebugInformationFormat="3" 360 361 /> 361 362 <Tool -
trunk/ab5.0/abdev/ProjectEditor/SubOperation.cpp
r477 r480 1260 1260 GetFullPath( temporary, pj_editor_Dir ); 1261 1261 pHeaderBuf = ReadBuffer_NonErrMsg( temporary ); 1262 if( !pHeaderBuf )1263 {1264 lstrcpy(temporary,".\\Include\\basic.sbp");1265 GetFullPath( temporary, pj_editor_Dir );1266 pHeaderBuf = ReadBuffer( temporary );1267 if( pHeaderBuf )1268 {1269 lstrcpy( pobj_nv->szIncludeDir, ".\\Include\\" );1270 }1271 }1272 1262 1273 1263 if( !pHeaderBuf ){ -
trunk/ab5.0/abdev/ab_common/ab_common.vcproj
r477 r480 17 17 <Configurations> 18 18 <Configuration 19 Name="Debug |Win32"19 Name="Debug(x86)|Win32" 20 20 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 21 21 IntermediateDirectory="$(ConfigurationName)" … … 49 49 WarningLevel="3" 50 50 Detect64BitPortabilityProblems="true" 51 DebugInformationFormat=" 4"51 DebugInformationFormat="3" 52 52 /> 53 53 <Tool … … 80 80 </Configuration> 81 81 <Configuration 82 Name="Release|Win32" 82 Name="Release(x86)|Win32" 83 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 84 IntermediateDirectory="$(ConfigurationName)" 85 ConfigurationType="4" 86 CharacterSet="2" 87 WholeProgramOptimization="1" 88 > 89 <Tool 90 Name="VCPreBuildEventTool" 91 /> 92 <Tool 93 Name="VCCustomBuildTool" 94 /> 95 <Tool 96 Name="VCXMLDataGeneratorTool" 97 /> 98 <Tool 99 Name="VCWebServiceProxyGeneratorTool" 100 /> 101 <Tool 102 Name="VCMIDLTool" 103 /> 104 <Tool 105 Name="VCCLCompilerTool" 106 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost" 107 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 108 RuntimeLibrary="0" 109 UsePrecompiledHeader="2" 110 WarningLevel="3" 111 Detect64BitPortabilityProblems="true" 112 DebugInformationFormat="3" 113 /> 114 <Tool 115 Name="VCManagedResourceCompilerTool" 116 /> 117 <Tool 118 Name="VCResourceCompilerTool" 119 /> 120 <Tool 121 Name="VCPreLinkEventTool" 122 /> 123 <Tool 124 Name="VCLibrarianTool" 125 /> 126 <Tool 127 Name="VCALinkTool" 128 /> 129 <Tool 130 Name="VCXDCMakeTool" 131 /> 132 <Tool 133 Name="VCBscMakeTool" 134 /> 135 <Tool 136 Name="VCFxCopTool" 137 /> 138 <Tool 139 Name="VCPostBuildEventTool" 140 /> 141 </Configuration> 142 <Configuration 143 Name="Debug(x64)|Win32" 144 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 145 IntermediateDirectory="$(ConfigurationName)" 146 ConfigurationType="4" 147 CharacterSet="2" 148 > 149 <Tool 150 Name="VCPreBuildEventTool" 151 /> 152 <Tool 153 Name="VCCustomBuildTool" 154 /> 155 <Tool 156 Name="VCXMLDataGeneratorTool" 157 /> 158 <Tool 159 Name="VCWebServiceProxyGeneratorTool" 160 /> 161 <Tool 162 Name="VCMIDLTool" 163 /> 164 <Tool 165 Name="VCCLCompilerTool" 166 Optimization="0" 167 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost" 168 PreprocessorDefinitions="WIN32;_DEBUG;_LIB" 169 MinimalRebuild="true" 170 BasicRuntimeChecks="3" 171 RuntimeLibrary="1" 172 UsePrecompiledHeader="2" 173 WarningLevel="3" 174 Detect64BitPortabilityProblems="true" 175 DebugInformationFormat="3" 176 /> 177 <Tool 178 Name="VCManagedResourceCompilerTool" 179 /> 180 <Tool 181 Name="VCResourceCompilerTool" 182 /> 183 <Tool 184 Name="VCPreLinkEventTool" 185 /> 186 <Tool 187 Name="VCLibrarianTool" 188 /> 189 <Tool 190 Name="VCALinkTool" 191 /> 192 <Tool 193 Name="VCXDCMakeTool" 194 /> 195 <Tool 196 Name="VCBscMakeTool" 197 /> 198 <Tool 199 Name="VCFxCopTool" 200 /> 201 <Tool 202 Name="VCPostBuildEventTool" 203 /> 204 </Configuration> 205 <Configuration 206 Name="Release(x64)|Win32" 83 207 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 84 208 IntermediateDirectory="$(ConfigurationName)" … … 157 281 > 158 282 <FileConfiguration 159 Name="Debug |Win32"283 Name="Debug(x86)|Win32" 160 284 > 161 285 <Tool … … 165 289 </FileConfiguration> 166 290 <FileConfiguration 167 Name="Release|Win32" 291 Name="Release(x86)|Win32" 292 > 293 <Tool 294 Name="VCCLCompilerTool" 295 UsePrecompiledHeader="1" 296 /> 297 </FileConfiguration> 298 <FileConfiguration 299 Name="Debug(x64)|Win32" 300 > 301 <Tool 302 Name="VCCLCompilerTool" 303 UsePrecompiledHeader="1" 304 /> 305 </FileConfiguration> 306 <FileConfiguration 307 Name="Release(x64)|Win32" 168 308 > 169 309 <Tool -
trunk/ab5.0/abdev/abcompiler32.sln
r475 r480 45 45 {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Release|Win32.ActiveCfg = Release(x86)|Win32 46 46 {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Release|Win32.Build.0 = Release(x86)|Win32 47 {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.ActiveCfg = Debug |Win3248 {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.Build.0 = Debug |Win3249 {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.ActiveCfg = Release |Win3250 {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.Build.0 = Release |Win3251 {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Debug|Win32.ActiveCfg = Debug |Win3252 {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Debug|Win32.Build.0 = Debug |Win3253 {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Release|Win32.ActiveCfg = Release |Win3254 {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Release|Win32.Build.0 = Release |Win3247 {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.ActiveCfg = Debug(x86)|Win32 48 {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.Build.0 = Debug(x86)|Win32 49 {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.ActiveCfg = Release(x86)|Win32 50 {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.Build.0 = Release(x86)|Win32 51 {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Debug|Win32.ActiveCfg = Debug(x86)|Win32 52 {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Debug|Win32.Build.0 = Debug(x86)|Win32 53 {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Release|Win32.ActiveCfg = Release(x86)|Win32 54 {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Release|Win32.Build.0 = Release(x86)|Win32 55 55 EndGlobalSection 56 56 GlobalSection(SolutionProperties) = preSolution -
trunk/ab5.0/abdev/abcompiler64.sln
r475 r480 5 5 EndProject 6 6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jenga", "..\jenga\projects\jenga\jenga.vcproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}" 7 EndProject 8 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ab_common", "ab_common\ab_common.vcproj", "{87835C33-64C9-4BA5-9B39-608BA5394387}" 7 9 EndProject 8 10 Global … … 16 18 {864B921B-423B-4F9E-9E6B-31B15968EDF9}.Release|Win32.ActiveCfg = Release|Win32 17 19 {864B921B-423B-4F9E-9E6B-31B15968EDF9}.Release|Win32.Build.0 = Release|Win32 18 {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.ActiveCfg = Debug(amd64)|Win32 19 {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.Build.0 = Debug(amd64)|Win32 20 {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.ActiveCfg = Release(amd64)|Win32 21 {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.Build.0 = Release(amd64)|Win32 20 {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.ActiveCfg = Debug(x64)|Win32 21 {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.Build.0 = Debug(x64)|Win32 22 {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.ActiveCfg = Release(x64)|Win32 23 {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.Build.0 = Release(x64)|Win32 24 {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.ActiveCfg = Debug(x64)|Win32 25 {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.Build.0 = Debug(x64)|Win32 26 {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.ActiveCfg = Release(x64)|Win32 27 {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.Build.0 = Release(x64)|Win32 22 28 EndGlobalSection 23 29 GlobalSection(SolutionProperties) = preSolution -
trunk/ab5.0/jenga/include/common/Environment.h
r477 r480 17 17 { 18 18 public: 19 static const std::string GetCurrentDir() 20 { 21 char temp[MAX_PATH]; 22 ::GetCurrentDirectory( MAX_PATH, temp ); 23 return temp; 24 } 25 19 26 static const std::string &GetAppDir() 20 27 { -
trunk/ab5.0/jenga/include/common/Path.h
r467 r480 64 64 65 65 static std::string MakeFullPath( const std::string &relativePath, const std::string &baseDirPath ); 66 static std::string MakeFullPathByCurrentDirectory( const std::string &relativePath ); 66 67 }; 67 68 -
trunk/ab5.0/jenga/projects/jenga/jenga.vcproj
r474 r480 16 16 <Configurations> 17 17 <Configuration 18 Name="Debug( amd64)|Win32"18 Name="Debug(x64)|Win32" 19 19 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 20 20 IntermediateDirectory="$(ConfigurationName)" … … 80 80 </Configuration> 81 81 <Configuration 82 Name="Release( amd64)|Win32"82 Name="Release(x64)|Win32" 83 83 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 84 84 IntermediateDirectory="$(ConfigurationName)" -
trunk/ab5.0/jenga/src/common/Path.cpp
r477 r480 1 1 #include <boost/foreach.hpp> 2 #include <jenga/include/common/Environment.h> 2 3 #include <jenga/include/common/Path.h> 3 4 … … 77 78 return resultPath; 78 79 } 80 std::string Jenga::Common::Path::MakeFullPathByCurrentDirectory( const std::string &relativePath ) 81 { 82 return MakeFullPath( relativePath, Jenga::Common::Environment::GetCurrentDir() ); 83 }
Note:
See TracChangeset
for help on using the changeset viewer.