packages: phpstorm/phpstorm.spec, phpstorm/pld.patch - up to 3.0
glen
glen at pld-linux.org
Tue Dec 6 19:58:37 CET 2011
Author: glen Date: Tue Dec 6 18:58:37 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.0
---- Files affected:
packages/phpstorm:
phpstorm.spec (1.12 -> 1.13) , pld.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/phpstorm/phpstorm.spec
diff -u packages/phpstorm/phpstorm.spec:1.12 packages/phpstorm/phpstorm.spec:1.13
--- packages/phpstorm/phpstorm.spec:1.12 Mon Oct 3 21:19:49 2011
+++ packages/phpstorm/phpstorm.spec Tue Dec 6 19:58:32 2011
@@ -1,7 +1,7 @@
# $Revision$, $Date$
Summary: Lightweight and Smart PHP IDE
Name: phpstorm
-Version: 2.1.5
+Version: 3.0
Release: 1
License: ?
Group: Development/Tools
@@ -38,7 +38,7 @@
Editor, JavaScript Editor) and adds full-fledged support for PHP.
%prep
-%setup -qn PhpStorm-107.658
+%setup -qn PhpStorm-111.19
%ifarch %{ix86}
rm bin/fsnotifier64
rm bin/libbreakgen64.so
@@ -87,10 +87,10 @@
%{_appdir}/license
%{_appdir}/plugins
%dir %{_appdir}/bin
-%{_appdir}/bin/PhpStorm.vmoptions
+%{_appdir}/bin/phpstorm.vmoptions
%{_appdir}/bin/idea.properties
%{_appdir}/bin/log.xml
-%attr(755,root,root) %{_appdir}/bin/PhpStorm.sh
+%attr(755,root,root) %{_appdir}/bin/phpstorm.sh
%attr(755,root,root) %{_appdir}/bin/fsnotifier
%attr(755,root,root) %{_appdir}/bin/libbreakgen.so
%attr(755,root,root) %{_appdir}/bin/libyjpagent.so
@@ -103,6 +103,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2011/12/06 18:58:32 glen
+- up to 3.0
+
Revision 1.12 2011/10/03 19:19:49 glen
- up to 2.1.5
================================================================
Index: packages/phpstorm/pld.patch
diff -u packages/phpstorm/pld.patch:1.5 packages/phpstorm/pld.patch:1.6
--- packages/phpstorm/pld.patch:1.5 Tue Sep 6 12:28:25 2011
+++ packages/phpstorm/pld.patch Tue Dec 6 19:58:32 2011
@@ -1,32 +1,29 @@
---- PhpStorm-107.581/bin/PhpStorm.sh~ 2011-09-01 18:24:43.000000000 +0300
-+++ PhpStorm-107.581/bin/PhpStorm.sh 2011-09-01 18:25:32.747999292 +0300
-@@ -27,19 +27,14 @@
- if [ -z "$WEBIDE_JDK" ]; then
- echo ERROR: cannot start WebIde.
- echo No JDK found to run WebIde. Please validate either WEBIDE_JDK, JDK_HOME or JAVA_HOME environment variable points to valid JDK installation.
+--- PhpStorm-111.19/bin/phpstorm.sh~ 2011-11-28 11:50:46.000000000 +0200
++++ PhpStorm-111.19/bin/phpstorm.sh 2011-12-06 19:55:51.616124548 +0200
+@@ -63,9 +63,6 @@
+ if [ -z "$JDK" ]; then
+ echo "ERROR: cannot start WebIde."
+ echo "No JDK found. Please validate either WEBIDE_JDK, JDK_HOME or JAVA_HOME environment variable points to valid JDK installation."
- echo
-- echo Press Enter to continue.
+- echo "Press Enter to continue."
- read IGNORE
exit 1
fi
fi
-
--VERSION_LOG='/tmp/java.version.log'
-+VERSION_LOG=$(mktemp java.version.XXXXXX 2>/dev/null || echo ${TMPDIR:-/tmp}/java.version.$$$RAND.log)
- $WEBIDE_JDK/bin/java -version 2> $VERSION_LOG
- grep 'OpenJDK' $VERSION_LOG
+@@ -74,8 +71,6 @@
+ $JDK/bin/java -version 2> "$VERSION_LOG"
+ grep 'OpenJDK' "$VERSION_LOG"
OPEN_JDK=$?
--grep '64-Bit' $VERSION_LOG
+-grep '64-Bit' "$VERSION_LOG"
-BITS=$?
- rm $VERSION_LOG
+ rm "$VERSION_LOG"
if [ $OPEN_JDK -eq 0 ]; then
- echo WARNING: You are launching IDE using OpenJDK Java runtime
-@@ -48,14 +43,6 @@
+ echo "WARNING: You are launching IDE using OpenJDK Java runtime."
+@@ -86,13 +81,6 @@
+ echo " please validate either WEBIDE_JDK, JDK_HOME, or JAVA_HOME environment variable points to valid Oracle (Sun) JDK installation."
+ echo " See http://ow.ly/6TuKQ for more info on switching default JDK"
echo
- echo NOTE: If you have both Sun JDK and OpenJDK installed
- echo please validate either WEBIDE_JDK or JDK_HOME environment variable points to valid Sun JDK installation
-- echo
-- echo Press Enter to continue.
+- echo "Press Enter to continue."
- read IGNORE
-fi
-if [ $BITS -eq 0 ]; then
@@ -36,31 +33,51 @@
fi
#--------------------------------------------------------------------------
-@@ -81,6 +81,8 @@
- REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.no.jre.check=true $AGENT $WEBIDE_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS"
- JVM_ARGS=`tr '\n' ' ' < "$WEBIDE_VM_OPTIONS"`
- JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS"
+@@ -134,7 +122,7 @@
+ # only extract properties (not VM options) from Info.plist
+ INFO_PLIST_PARSER_OPTIONS=""
+ else
+- [ "$BITS" == "64" ] && INFO_PLIST_PARSER_OPTIONS=" 64" || INFO_PLIST_PARSER_OPTIONS=" 32"
++ [ "$BITS" = "64" ] && INFO_PLIST_PARSER_OPTIONS=" 64" || INFO_PLIST_PARSER_OPTIONS=" 32"
+ fi
+
+ # in Mac OS X ./Contents/Info.plist describes all VM options & system properties
+@@ -144,7 +132,8 @@
+
+ REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.no.jre.check=true -Didea.paths.selector=WebIde10 $IDE_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS"
+
+-JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS $MAC_VM_OPTIONS $AGENT"
+WEBIDE_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/WebIde10"
-+JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS -Dwebide.config.home=$WEBIDE_CONFIG_HOME"
++JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS -Dwebide.config.home=$WEBIDE_CONFIG_HOME $MAC_VM_OPTIONS $AGENT"
CLASSPATH=../lib/bootstrap.jar
CLASSPATH=$CLASSPATH:../lib/util.jar
---- PhpStorm-103.99/bin/idea.properties~ 2011-02-14 11:44:54.000000000 +0200
-+++ PhpStorm-103.99/bin/idea.properties 2011-03-11 07:48:34.638262763 +0200
-@@ -10,13 +10,13 @@
- # Note for Windows users: please make sure you're using forward slashes. I.e. c:/idea/system
-
- # path to IDEA config folder. Make sure you're using forward slashes
--idea.config.path=${user.home}/.WebIde10/config
+--- PhpStorm-111.19/bin/idea.properties~ 2011-11-28 11:44:59.000000000 +0200
++++ PhpStorm-111.19/bin/idea.properties 2011-12-06 19:58:00.925419184 +0200
+@@ -12,22 +12,22 @@
+ #---------------------------------------------------------------------
+ # Uncomment this option if you want to customize path to WebIde config folder. Make sure you're using forward slashes
+ #---------------------------------------------------------------------
+-# idea.config.path=${user.home}/.WebIde/config
+idea.config.path=${webide.config.home}/config
- # path to IDEA system folder. Make sure you're using forward slashes
--idea.system.path=${user.home}/.WebIde10/system
+ #---------------------------------------------------------------------
+ # Uncomment this option if you want to customize path to WebIde system folder. Make sure you're using forward slashes
+ #---------------------------------------------------------------------
+-# idea.system.path=${user.home}/.WebIde/system
+idea.system.path=${webide.config.home}/system
- # path to user installed plugins folder. Make sure you're using forward slashes
--idea.plugins.path=${user.home}/.WebIde10/config/plugins
+ #---------------------------------------------------------------------
+ # Uncomment this option if you want to customize path to user installed plugins folder. Make sure you're using forward slashes
+ #---------------------------------------------------------------------
+-# idea.plugins.path=${user.home}/.WebIde/config/plugins
+idea.plugins.path=${webide.config.home}/config/plugins
#---------------------------------------------------------------------
- # Maximum file size (kilobytes) IDEA should provide code assistance for.
+ # Uncomment this option if you want to customize path to WebIde logs folder. Make sure you're using forward slashes
+ #---------------------------------------------------------------------
+-# idea.log.path=${user.home}/.WebIde/system/log
++idea.log.path=${webide.config.home}/system/log
+
+ #---------------------------------------------------------------------
+ # Maximum file size (kilobytes) IDE should provide code assistance for.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/phpstorm.spec?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/pld.patch?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list