mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
Fixed recipe for Paladin, recipe, work by GCI2013 student Adrián Arroyo Calle
This commit is contained in:
Scott McCreary
13
haiku-apps/paladin/patches/LibWindow.patch
Normal file
13
haiku-apps/paladin/patches/LibWindow.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/Paladin/LibWindow.cpp b/Paladin/LibWindow.cpp
|
||||
index c75e6ee..fb1537f 100644
|
||||
--- a/Paladin/LibWindow.cpp
|
||||
+++ b/Paladin/LibWindow.cpp
|
||||
@@ -208,7 +208,7 @@ LibraryWindow::ScanThread(void *data)
|
||||
|
||||
r.OffsetBy(0,r.Height() + 10);
|
||||
|
||||
- out = win->ScanFolder(r.LeftTop(),"/boot/common/lib",&maxwidth);
|
||||
+ out = win->ScanFolder(r.LeftTop(),"/boot/system/lib",&maxwidth);
|
||||
if (out != BRect(0,0,-1,-1));
|
||||
{
|
||||
r = out;
|
||||
@@ -1,181 +1,130 @@
|
||||
diff -up Paladin-1.3.src/PalEdit/Jamfile.orig Paladin-1.3.src/PalEdit/Jamfile
|
||||
--- Paladin-1.3.src/PalEdit/Jamfile.orig 2013-07-26 16:21:05.044040192 -0600
|
||||
+++ Paladin-1.3.src/PalEdit/Jamfile 2013-07-26 16:21:05.049807360 -0600
|
||||
@@ -0,0 +1,10 @@
|
||||
+SubDir TOP ;
|
||||
+
|
||||
+SubInclude TOP rez ;
|
||||
+SubInclude TOP Sources ;
|
||||
+SubInclude TOP Extensions ;
|
||||
+SubInclude TOP Resources ;
|
||||
+SubInclude TOP Languages ;
|
||||
+
|
||||
+MakeDistro distro ;
|
||||
+
|
||||
diff -up Paladin-1.3.src/PalEdit/Jamrules.orig Paladin-1.3.src/PalEdit/Jamrules
|
||||
--- Paladin-1.3.src/PalEdit/Jamrules.orig 2013-07-26 16:21:05.068157440 -0600
|
||||
+++ Paladin-1.3.src/PalEdit/Jamrules 2013-07-26 16:21:05.068419584 -0600
|
||||
@@ -0,0 +1,67 @@
|
||||
+
|
||||
+# The directories used by the build.
|
||||
+BUILD_DIR = [ FDirName $(TOP) build ] ;
|
||||
+GENERATED_DIR = [ FDirName $(TOP) generated ] ;
|
||||
+DISTRO_DIR = [ FDirName $(TOP) generated distro ] ;
|
||||
+
|
||||
+# First find out which gcc version the platform uses.
|
||||
+IS_GCC_4_PLATFORM = ;
|
||||
+if $(OS) = HAIKU {
|
||||
+ # Only Haiku might use gcc 4. We use the existence of a libstdc++.r4.so in
|
||||
+ # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus
|
||||
+ # gcc 2 platform. This is not entirely correct, but should be good enough
|
||||
+ # for the time being.
|
||||
+ local hasLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ;
|
||||
+ if ! $(hasLibStdC++.R4) {
|
||||
+ IS_GCC_4_PLATFORM = 1 ;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+include [ FDirName $(BUILD_DIR) HelperRules ] ;
|
||||
+include [ FDirName $(BUILD_DIR) ConfigRules ] ;
|
||||
+include [ FDirName $(BUILD_DIR) OverriddenJamRules ] ;
|
||||
+include [ FDirName $(BUILD_DIR) MainBuildRules ] ;
|
||||
+include [ FDirName $(BUILD_DIR) BuildSettings ] ;
|
||||
+
|
||||
+# Include UserBuildConfig.
|
||||
+{
|
||||
+ local userBuildConfig = [ GLOB $(BUILD_DIR) : UserBuildConfig ] ;
|
||||
+ if $(userBuildConfig)
|
||||
+ {
|
||||
+ LOCATE on UserBuildConfig = $(BUILD_DIR) ;
|
||||
+ include UserBuildConfig ;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+# default to strip generated apps if not specified otherwise:
|
||||
+STRIP_APPS ?= 1 ;
|
||||
+
|
||||
+# Cache files for header scanning and jamfile caching.
|
||||
+HCACHEFILE = header_cache ;
|
||||
+JCACHEFILE = jamfile_cache ;
|
||||
+LOCATE on $(HCACHEFILE) $(JCACHEFILE) = $(GENERATED_DIR) ;
|
||||
+
|
||||
+
|
||||
+rule MakeDistro
|
||||
+{
|
||||
+ # MakeDistro <target>
|
||||
+
|
||||
+ local target = $1 ;
|
||||
+
|
||||
+ NotFile $(target) ;
|
||||
+ Always $(target) ;
|
||||
+}
|
||||
+
|
||||
+actions MakeDistro
|
||||
+{
|
||||
+ echo "making distro $(DISTRO_DIR)" ;
|
||||
+ rm -rf $(DISTRO_DIR)/Documentation ;
|
||||
+ mkdir $(DISTRO_DIR)/Documentation ;
|
||||
+ cp -a $(TOP)/doc/*.html $(DISTRO_DIR)/Documentation/ ;
|
||||
+ mkdir $(DISTRO_DIR)/Documentation/gifs ;
|
||||
+ cp -a $(TOP)/doc/gifs/*.gif $(DISTRO_DIR)/Documentation/gifs/ ;
|
||||
+ ln -sf Documentation/index.html $(DISTRO_DIR)/Documentation.html ;
|
||||
+ ln -sfn $(COMMON_FOLDER)/bin $(DISTRO_DIR)/\(drag\ lpe\ here\ to\ install\) ;
|
||||
+ cp -a $(COMMON_FOLDER)/lib/libpcre*.so $(DISTRO_DIR)/lib/ ;
|
||||
+}
|
||||
+
|
||||
diff -up Paladin-1.3.src/PalEdit/build/MainBuildRules.orig Paladin-1.3.src/PalEdit/build/MainBuildRules
|
||||
--- Paladin-1.3.src/PalEdit/build/MainBuildRules.orig 2013-07-26 16:22:28.599523328 -0600
|
||||
+++ Paladin-1.3.src/PalEdit/build/MainBuildRules 2013-07-26 16:22:40.338690048 -0600
|
||||
@@ -64,7 +64,7 @@ rule SharedLibrary
|
||||
MakeLocate $(lib) : $(LOCATE_MAIN_TARGET) ;
|
||||
local linkFlags ;
|
||||
if $(OSPLAT) = X86 {
|
||||
- linkFlags = -nostart -Xlinker -soname=\"$(lib)\" ;
|
||||
+ linkFlags = -shared -Xlinker -soname=\"$(lib)\" ;
|
||||
} else {
|
||||
linkFlags = -xms ;
|
||||
}
|
||||
diff -up Paladin-1.3.src/Paladin/Project.cpp.orig Paladin-1.3.src/Paladin/Project.cpp
|
||||
--- Paladin-1.3.src/Paladin/Project.cpp.orig 2013-07-26 16:23:09.954728448 -0600
|
||||
+++ Paladin-1.3.src/Paladin/Project.cpp 2013-07-26 16:23:23.971505664 -0600
|
||||
@@ -799,7 +799,7 @@ Project::Link(void)
|
||||
}
|
||||
case TARGET_SHARED_LIB:
|
||||
diff --git a/PalEdit/Sources/CDoc.cpp b/PalEdit/Sources/CDoc.cpp
|
||||
index e5ced11..d9f5dfa 100644
|
||||
--- a/PalEdit/Sources/CDoc.cpp
|
||||
+++ b/PalEdit/Sources/CDoc.cpp
|
||||
@@ -451,7 +451,7 @@ void CDoc::AddRecent(const char *path)
|
||||
BPath tp;
|
||||
try
|
||||
{
|
||||
- FailOSErr(find_directory(B_COMMON_TEMP_DIRECTORY, &tp));
|
||||
+ FailOSErr(find_directory(B_SYSTEM_TEMP_DIRECTORY, &tp));
|
||||
if (strncmp(tp.Path(), path, strlen(tp.Path())) == 0)
|
||||
return;
|
||||
}
|
||||
diff --git a/PalEdit/Sources/CDocIO.cpp b/PalEdit/Sources/CDocIO.cpp
|
||||
index 81fe4b1..1ae3366 100644
|
||||
--- a/PalEdit/Sources/CDocIO.cpp
|
||||
+++ b/PalEdit/Sources/CDocIO.cpp
|
||||
@@ -198,7 +198,7 @@ static bool CopyFile(BEntry& srcEntry, BEntry& dstEntry)
|
||||
return true;
|
||||
}
|
||||
|
||||
-#ifndef B_ZETA_VERSION_1_2_0 // maybe even B_ZETA_VERSION_1_1_0
|
||||
+#ifndef B_HAIKU_VERSION // maybe even B_ZETA_VERSION_1_1_0
|
||||
bool operator< (const node_ref& left, const node_ref& right)
|
||||
{
|
||||
if (left.node < right.node)
|
||||
diff --git a/PalEdit/Sources/CDocIO.h b/PalEdit/Sources/CDocIO.h
|
||||
index aa96fef..0ae9856 100644
|
||||
--- a/PalEdit/Sources/CDocIO.h
|
||||
+++ b/PalEdit/Sources/CDocIO.h
|
||||
@@ -52,7 +52,7 @@ inline time_t CDocIO::LastSaved() const
|
||||
return fLastSaved;
|
||||
}
|
||||
|
||||
-#ifndef B_ZETA_VERSION_1_2_0 // maybe even B_ZETA_VERSION_1_1_0
|
||||
+#ifndef B_HAIKU_VERSION // maybe even B_ZETA_VERSION_1_1_0
|
||||
bool operator< (const node_ref& left, const node_ref& right);
|
||||
#endif
|
||||
|
||||
diff --git a/PalEdit/Sources/CMimeBox.cpp b/PalEdit/Sources/CMimeBox.cpp
|
||||
index f4fc7cc..c86cf37 100644
|
||||
--- a/PalEdit/Sources/CMimeBox.cpp
|
||||
+++ b/PalEdit/Sources/CMimeBox.cpp
|
||||
@@ -71,7 +71,7 @@ CMimeItem::CMimeItem(const char *mime)
|
||||
try
|
||||
{
|
||||
char p[PATH_MAX];
|
||||
- if (find_directory(B_COMMON_TEMP_DIRECTORY, 0, true, p, PATH_MAX) == B_OK)
|
||||
+ if (find_directory(B_SYSTEM_TEMP_DIRECTORY, 0, true, p, PATH_MAX) == B_OK)
|
||||
{
|
||||
- linkString << "-nostart -Xlinker -soname=" << GetTargetName() << " ";
|
||||
+ linkString << "-shared -Xlinker -soname=" << GetTargetName() << " ";
|
||||
break;
|
||||
}
|
||||
default:
|
||||
diff -up Paladin-1.3.src/Paladin/buildhaikugcc2.sh.orig Paladin-1.3.src/Paladin/buildhaikugcc2.sh
|
||||
--- Paladin-1.3.src/Paladin/buildhaikugcc2.sh.orig 2013-07-26 16:21:04.718798848 -0600
|
||||
+++ Paladin-1.3.src/Paladin/buildhaikugcc2.sh 2013-07-26 16:21:05.096731136 -0600
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
-gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lpcre -llocale
|
||||
+gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lpcre
|
||||
xres -o Paladin Paladin.rsrc
|
||||
mimeset -all Paladin
|
||||
diff -up Paladin-1.3.src/Paladin/buildhaikugcc4.sh.orig Paladin-1.3.src/Paladin/buildhaikugcc4.sh
|
||||
--- Paladin-1.3.src/Paladin/buildhaikugcc4.sh.orig 2013-07-26 16:21:04.719323136 -0600
|
||||
+++ Paladin-1.3.src/Paladin/buildhaikugcc4.sh 2013-07-26 16:21:05.099090432 -0600
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
-gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lsupc++ -lstdc++ -lpcre -llocale
|
||||
+gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lsupc++ -lstdc++ -lpcre
|
||||
xres -o Paladin Paladin.rsrc
|
||||
mimeset -all Paladin
|
||||
diff -up Paladin-1.3.src/SymbolFinder/Makefile.orig Paladin-1.3.src/SymbolFinder/Makefile
|
||||
--- Paladin-1.3.src/SymbolFinder/Makefile.orig 2013-07-26 16:21:33.282329088 -0600
|
||||
+++ Paladin-1.3.src/SymbolFinder/Makefile 2013-07-26 16:21:33.282066944 -0600
|
||||
@@ -0,0 +1,27 @@
|
||||
+NAME= SymbolFinder
|
||||
+TYPE= APP
|
||||
+SRCS= App.cpp DPath.cpp DWindow.cpp MainWindow.cpp
|
||||
+RSRCS=
|
||||
+LIBS= /boot/develop/lib/x86/libroot.so /boot/develop/lib/x86/libbe.so /boot/system/lib/libstdc++.so /boot/develop/lib/x86/libsupc++.so /boot/develop/lib/x86/libstdc++.so
|
||||
+LIBPATHS=
|
||||
+SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/home/config/include /boot/develop/abi/x86/lib
|
||||
+LOCAL_INCLUDE_PATHS=
|
||||
+OPTIMIZE=FULL
|
||||
+# specify any preprocessor symbols to be defined. The symbols will not
|
||||
+# have their values set automatically; you must supply the value (if any)
|
||||
+# to use. For example, setting DEFINES to "DEBUG=1" will cause the
|
||||
+# compiler option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG"
|
||||
+# would pass "-DDEBUG" on the compiler's command line.
|
||||
+DEFINES=
|
||||
+# specify special warning levels
|
||||
+# if unspecified default warnings will be used
|
||||
+# NONE = supress all warnings
|
||||
+# ALL = enable all warnings
|
||||
+WARNINGS =
|
||||
+# Build with debugging symbols if set to TRUE
|
||||
+SYMBOLS=
|
||||
+COMPILER_FLAGS=
|
||||
+LINKER_FLAGS=
|
||||
+
|
||||
+## include the makefile-engine
|
||||
+include $(BUILDHOME)/etc/makefile-engine
|
||||
diff -urN Paladin-1.3.src/Paladin/buildhaikugcc2.sh Paladin-1.3.src/Paladin/buildhaikugcc2.sh-
|
||||
--- Paladin-1.3.src/Paladin/buildhaikugcc2.sh 2013-07-19 18:41:25.292028416 +0200
|
||||
+++ Paladin-1.3.src/Paladin/buildhaikugcc2.sh- 2013-07-19 18:38:29.508035072 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
-gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lpcre -llocale
|
||||
+gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lpcre
|
||||
xres -o Paladin Paladin.rsrc
|
||||
mimeset -all Paladin
|
||||
|
||||
diff -urN Paladin-1.3.src/Paladin/buildhaikugcc4.sh Paladin-1.3.src/Paladin/buildhaikugcc4.sh-
|
||||
--- Paladin-1.3.src/Paladin/buildhaikugcc4.sh 2013-07-19 18:41:14.299368448 +0200
|
||||
+++ Paladin-1.3.src/Paladin/buildhaikugcc4.sh- 2013-07-19 18:38:34.475004928 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
-gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lsupc++ -lstdc++ -lpcre -llocale
|
||||
+gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lsupc++ -lstdc++ -lpcre
|
||||
xres -o Paladin Paladin.rsrc
|
||||
mimeset -all Paladin
|
||||
BDirectory tmpdir;
|
||||
FailOSErr(tmpdir.SetTo(p));
|
||||
diff --git a/PalEdit/Sources/Sstdio.cpp b/PalEdit/Sources/Sstdio.cpp
|
||||
index 76c7b19..88b2a24 100644
|
||||
--- a/PalEdit/Sources/Sstdio.cpp
|
||||
+++ b/PalEdit/Sources/Sstdio.cpp
|
||||
@@ -37,7 +37,7 @@
|
||||
#include "Sstdio.h"
|
||||
#include <stdarg.h>
|
||||
#include <ctype.h>
|
||||
-#ifdef BONE_BUILD
|
||||
+#ifdef B_HAIKU_VERSION
|
||||
#include <sys/socket.h>
|
||||
#include <sys/select.h>
|
||||
#else
|
||||
diff --git a/Paladin/Project.cpp b/Paladin/Project.cpp
|
||||
index 9f4c42d..054e72f 100644
|
||||
--- a/Paladin/Project.cpp
|
||||
+++ b/Paladin/Project.cpp
|
||||
@@ -214,7 +214,7 @@ Project::Load(const char *path)
|
||||
if (actualPlatform == PLATFORM_HAIKU_GCC4 && actualPlatform != fPlatform)
|
||||
{
|
||||
BPath libpath;
|
||||
- find_directory(B_COMMON_DEVELOP_DIRECTORY,&libpath);
|
||||
+ find_directory(B_SYSTEM_DEVELOP_DIRECTORY,&libpath);
|
||||
libpath.Append("lib/x86/libsupc++.so");
|
||||
AddLibrary(libpath.Path());
|
||||
}
|
||||
@@ -1473,7 +1473,7 @@ Project::FindLibrary(const char *libname)
|
||||
return outpath;
|
||||
}
|
||||
|
||||
- find_directory(B_COMMON_LIB_DIRECTORY,&tempPath);
|
||||
+ find_directory(B_SYSTEM_LIB_DIRECTORY,&tempPath);
|
||||
tempPath.Append(libname);
|
||||
if (BEntry(tempPath.Path()).Exists())
|
||||
{
|
||||
@@ -1485,7 +1485,7 @@ Project::FindLibrary(const char *libname)
|
||||
return outpath;
|
||||
}
|
||||
|
||||
- find_directory(B_COMMON_DEVELOP_DIRECTORY,&tempPath);
|
||||
+ find_directory(B_SYSTEM_DEVELOP_DIRECTORY,&tempPath);
|
||||
tempPath.Append("lib/x86/");
|
||||
tempPath.Append(libname);
|
||||
if (BEntry(tempPath.Path()).Exists())
|
||||
diff --git a/Paladin/TemplateManager.cpp b/Paladin/TemplateManager.cpp
|
||||
index 01f41f9..aea1e89 100644
|
||||
--- a/Paladin/TemplateManager.cpp
|
||||
+++ b/Paladin/TemplateManager.cpp
|
||||
@@ -242,10 +242,10 @@ ProjectTemplate::RefForLib(const BString &path)
|
||||
find_directory(B_USER_LIB_DIRECTORY,&bpath);
|
||||
str.IReplaceFirst("B_USER_LIB_DIRECTORY",bpath.Path());
|
||||
}
|
||||
- else if (str.IFindFirst("B_COMMON_LIB_DIRECTORY") >= 0)
|
||||
+ else if (str.IFindFirst("B_SYSTEM_LIB_DIRECTORY") >= 0)
|
||||
{
|
||||
- find_directory(B_COMMON_LIB_DIRECTORY,&bpath);
|
||||
- str.IReplaceFirst("B_COMMON_LIB_DIRECTORY",bpath.Path());
|
||||
+ find_directory(B_SYSTEM_LIB_DIRECTORY,&bpath);
|
||||
+ str.IReplaceFirst("B_SYSTEM_LIB_DIRECTORY",bpath.Path());
|
||||
}
|
||||
|
||||
entry_ref ref;
|
||||
diff --git a/Paladin/build.sh b/Paladin/build.sh
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/SymbolFinder/MainWindow.cpp b/SymbolFinder/MainWindow.cpp
|
||||
index a53848b..aab1c63 100644
|
||||
--- a/SymbolFinder/MainWindow.cpp
|
||||
+++ b/SymbolFinder/MainWindow.cpp
|
||||
@@ -130,7 +130,7 @@ MainWindow::DoSearch(const char *text)
|
||||
if (status == B_OK && find_directory(B_USER_LIB_DIRECTORY,&path) == B_OK)
|
||||
status = SearchLibPath(path.Path(),text);
|
||||
|
||||
- if (status == B_OK && BEntry("/boot/common").Exists() && find_directory(B_COMMON_LIB_DIRECTORY,&path) == B_OK)
|
||||
+ if (status == B_OK && BEntry("/boot/system").Exists() && find_directory(B_SYSTEM_LIB_DIRECTORY,&path) == B_OK)
|
||||
status = SearchLibPath(path.Path(),text);
|
||||
|
||||
Lock();
|
||||
|
||||
Reference in New Issue
Block a user