i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

InstallSourceArchive now copies source archives to _sources_/, which in turn

Browse Source 
is ignored by Installer. Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36517 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-04-28 13:38:49 +00:00
parent ab5fb573e5
commit 4a71fc35b6
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+1 -1
View File
@@ -814,7 +814,7 @@ rule InstallSourceArchive file : url
local archiveFile = [ DownloadFile $(file) : $(url) ] ; local archiveFile = [ DownloadFile $(file) : $(url) ] ;
# copy directly into image # copy directly into image
AddFilesToHaikuImage develop sources : $(archiveFile) ; AddFilesToHaikuImage _sources_ : $(archiveFile) ;
} }
} }
src/apps/installer/CopyEngine.cpp
+6 -1
View File
@@ -107,7 +107,8 @@ CopyEngine::ResetTargets(const char* source)
// makes sense, since passing a volume is meant to folders that are // makes sense, since passing a volume is meant to folders that are
// volume specific, like "trash". // volume specific, like "trash".
BPath path(source); BPath path(source);
if (path.Append("common/var") == B_OK) if ((path.Append("common/var") == B_OK)
|| (path.Append("_sources_") == B_OK))
fVarDirectory.SetTo(path.Path()); fVarDirectory.SetTo(path.Path());
else else
fVarDirectory.Unset(); fVarDirectory.Unset();
@@ -516,6 +517,10 @@ CopyEngine::_ShouldCopyEntry(const BEntry& entry, const char* name,
printf("ignoring '%s'.\n", name); printf("ignoring '%s'.\n", name);
return false; return false;
} }
if (strcmp(SOURCES_DIRECTORY, name) == 0) {
printf("ignoring '%s'.\n", name);
return false;
}
if (strcmp("rr_moved", name) == 0) { if (strcmp("rr_moved", name) == 0) {
printf("ignoring '%s'.\n", name); printf("ignoring '%s'.\n", name);
return false; return false;
src/apps/installer/InstallerWindow.h
+1
View File
@@ -38,6 +38,7 @@ const uint32 MSG_RESET = 'iRSI';
const uint32 MSG_WRITE_BOOT_SECTOR = 'iWBS'; const uint32 MSG_WRITE_BOOT_SECTOR = 'iWBS';
const char PACKAGES_DIRECTORY[] = "_packages_"; const char PACKAGES_DIRECTORY[] = "_packages_";
const char SOURCES_DIRECTORY[] = "_sources_";
const char VAR_DIRECTORY[] = "var"; const char VAR_DIRECTORY[] = "var";