[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [necessitas-tools] /: Final touch for alpha4
From: BogDan Vatra <bogdan () kde ! org>
Date: 2012-08-31 17:52:36
Message-ID: 20120831175236.24DC0A60D9 () git ! kde ! org
[Download RAW message or body]
Git commit caeecf4005a499d0a58988fcca74027789cb3cb0 by BogDan Vatra.
Committed on 31/08/2012 at 19:51.
Pushed by vatra into branch 'master'.
Final touch for alpha4
M +0 -1 build_sdk.sh
M +2 -2 config/config.xml
M +1 -0 packages/org.kde.necessitas.misc.ndk.ma/meta/package.xml
M +18 -19 packages/org.kde.necessitas.tools.qtcreator/meta/installscript.qs
M +1 -1 sdk_vars.sh
http://commits.kde.org/necessitas-tools/caeecf4005a499d0a58988fcca74027789cb3cb0
diff --git a/build_sdk.sh b/build_sdk.sh
index 0d63444..410e2a6 100755
--- a/build_sdk.sh
+++ b/build_sdk.sh
@@ -1281,7 +1281,6 @@ function compileNecessitasQt #params $1 architecture, $2 \
package path, $3 NDK_TA rm -fr install
rm -fr Android
unset INSTALL_ROOT
- make QtJar
../qt-src/android/androidconfigbuild.sh -l $NDK_TARGET -c 0 -q 0 -n \
$TEMP_PATH/android-ndk -a $ANDROID_ARCH -b 0 -k 1 -i $NQT_INSTALL_DIR || error_msg \
"Can't install android-qt"
mkdir -p $2/$1
diff --git a/config/config.xml b/config/config.xml
index 18ffabb..adf41a1 100644
--- a/config/config.xml
+++ b/config/config.xml
@@ -12,8 +12,8 @@
<UninstallerName>SDKMaintenanceTool</UninstallerName>
<RemoteRepositories>
<Repository>
-<!-- <Url>http://files.kde.org/necessitas/sdk_master</Url> -->
- <Url>http://filesmaster.kde.org/necessitas/test</Url>
+ <Url>http://files.kde.org/necessitas/sdk_alpha4</Url>
+<!-- <Url>http://filesmaster.kde.org/necessitas/test</Url> -->
<Required>true</Required>
</Repository>
</RemoteRepositories>
diff --git a/packages/org.kde.necessitas.misc.ndk.ma/meta/package.xml \
b/packages/org.kde.necessitas.misc.ndk.ma/meta/package.xml index 3e99de2..acaeadd \
100644
--- a/packages/org.kde.necessitas.misc.ndk.ma/meta/package.xml
+++ b/packages/org.kde.necessitas.misc.ndk.ma/meta/package.xml
@@ -10,4 +10,5 @@
<Default>true</Default>
<InstallPriority>0</InstallPriority>
<SortingPriority>0</SortingPriority>
+ <ForcedInstallation>true</ForcedInstallation>
</Package>
diff --git a/packages/org.kde.necessitas.tools.qtcreator/meta/installscript.qs \
b/packages/org.kde.necessitas.tools.qtcreator/meta/installscript.qs index \
ee502c3..e618446 100644
--- a/packages/org.kde.necessitas.tools.qtcreator/meta/installscript.qs
+++ b/packages/org.kde.necessitas.tools.qtcreator/meta/installscript.qs
@@ -68,10 +68,10 @@ registerWindowsFileTypeExtensions = function()
for (var i = 0; i < headerExtensions.length; ++i) {
component.addOperation( "RegisterFileType",
headerExtensions[i],
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client \
'%1'", + "@TargetDir@\\QtCreator\\bin\\necessitas.bat \
-client '%1'", "C++ Header file",
"",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,3");
+ "@TargetDir@\\QtCreator\\bin\\necessitas.bat,3");
}
var cppExtensions = new Array("cc", "cxx", "c++", "cp", "cpp");
@@ -79,48 +79,48 @@ registerWindowsFileTypeExtensions = function()
for (var i = 0; i < cppExtensions.length; ++i) {
component.addOperation( "RegisterFileType",
cppExtensions[i],
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client \
'%1'", + "@TargetDir@\\QtCreator\\bin\\necessitas.bat \
-client '%1'", "C++ Source file",
"",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,2");
+ "@TargetDir@\\QtCreator\\bin\\necessitas.bat,2");
}
component.addOperation( "RegisterFileType",
"c",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client \
'%1'", + "@TargetDir@\\QtCreator\\bin\\necessitas.bat \
-client '%1'", "C Source file",
"",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,1");
+ "@TargetDir@\\QtCreator\\bin\\necessitas.bat,1");
component.addOperation( "RegisterFileType",
"ui",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client \
'%1'", + "@TargetDir@\\QtCreator\\bin\\necessitas.bat \
-client '%1'", "Qt UI file",
"",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,4");
+ "@TargetDir@\\QtCreator\\bin\\necessitas.bat,4");
component.addOperation( "RegisterFileType",
"pro",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client \
'%1'", + "@TargetDir@\\QtCreator\\bin\\necessitas.bat \
-client '%1'", "Qt Project file",
"",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,5");
+ "@TargetDir@\\QtCreator\\bin\\necessitas.bat,5");
component.addOperation( "RegisterFileType",
"pri",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client \
'%1'", + "@TargetDir@\\QtCreator\\bin\\necessitas.bat \
-client '%1'", "Qt Project Include file",
"",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,6");
+ "@TargetDir@\\QtCreator\\bin\\necessitas.bat,6");
component.addOperation( "RegisterFileType",
"qs",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client \
'%1'", + "@TargetDir@\\QtCreator\\bin\\necessitas.bat \
-client '%1'", "Qt Script file",
"",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,0");
+ "@TargetDir@\\QtCreator\\bin\\necessitas.bat,0");
component.addOperation( "RegisterFileType",
"qml",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client \
'%1'", + "@TargetDir@\\QtCreator\\bin\\necessitas.bat \
-client '%1'", "Qt Quick Markup language file",
"",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,0");
+ "@TargetDir@\\QtCreator\\bin\\necessitas.bat,0");
}
Component.prototype.createOperations = function()
@@ -136,7 +136,7 @@ Component.prototype.createOperations = function()
"@TargetDir@/QtCreator/bin",
"@TargetDir@/QtCreator/bin");
component.addOperation( "CreateShortcut",
- "@TargetDir@\\QtCreator\\bin\\qtcreator.exe",
+ "@TargetDir@\\QtCreator\\bin\\necessitas.bat",
"@StartMenuDir@/Qt Creator.lnk",
"workingDirectory=@homeDir@" );
registerWindowsFileTypeExtensions();
@@ -160,7 +160,7 @@ Component.prototype.createOperations = function()
{
if (installer.value("os") == "win")
{
- installer.setValue("RunProgram", installer.value("TargetDir") + \
"\\QtCreator\\bin\\qtcreator.exe"); + installer.setValue("RunProgram", \
installer.value("TargetDir") + "\\QtCreator\\bin\\necessitas.bat"); }
else if (installer.value("os") == "x11")
{
@@ -172,5 +172,4 @@ Component.prototype.createOperations = function()
}
installer.setValue("RunProgramDescription", "Launch Qt Creator");
}
-
}
diff --git a/sdk_vars.sh b/sdk_vars.sh
index 30578a7..a446d38 100644
--- a/sdk_vars.sh
+++ b/sdk_vars.sh
@@ -1,4 +1,4 @@
-MINISTRO_VERSION="0.4" #Ministro repo version
+MINISTRO_VERSION="0.406" #Ministro repo version
OSTYPE_MAJOR=${OSTYPE//[0-9.]/}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic