Skip to content

Commit 56e8457

Browse files
dernhelm7dernhelm7
committed
Adds recommended line normalization
If you have line normalization set for the repo, developers won't have to worry about their settings. https://help.github.com/articles/dealing-with-line-endings
1 parent e43564e commit 56e8457

File tree

5 files changed

+217
-195
lines changed

5 files changed

+217
-195
lines changed

‎.gitattributes

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union
8+
*.vbproj merge=union
9+
*.fsproj merge=union
10+
*.dbproj merge=union
11+
12+
# Standard to msysgit
13+
*.doc diff=astextplain
14+
*.DOC diff=astextplain
15+
*.docx diff=astextplain
16+
*.DOCX diff=astextplain
17+
*.dot diff=astextplain
18+
*.DOT diff=astextplain
19+
*.pdf diff=astextplain
20+
*.PDF diff=astextplain
21+
*.rtf diff=astextplain
22+
*.RTF diff=astextplain

‎kivy/tools/packaging/README.txt

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
The files in teh win32 and osx subdirectories are
2-
source and resource files that are used in the respective
3-
portable packaged versions of kivy for each OS. Here, they
4-
are under version controll.
5-
6-
setup.py copies these files into the portable distribution
7-
package that is created when you launch
8-
'setup.py build_portable'
9-
10-
11-
For example the win32 dir has the READMEand bat file which
1+
The files in teh win32 and osx subdirectories are
2+
source and resource files that are used in the respective
3+
portable packaged versions of kivy for each OS. Here, they
4+
are under version controll.
5+
6+
setup.py copies these files into the portable distribution
7+
package that is created when you launch
8+
'setup.py build_portable'
9+
10+
11+
For example the win32 dir has the READMEand bat file which
1212
sets up the ENV variables and launches the python interpreter.

‎kivy/tools/packaging/win32/README.txt

+79-79
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
1-
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
2-
READ THIS FIRST
3-
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4-
5-
This version of Kivy is a portable win32 version, 32 bits. (it work also for
6-
64 bits Windows.) This means everything you need to run kivy (including
7-
python and all other dependencies etc) are included.
8-
9-
This README only addresses the things specific to the portable version of kivy.
10-
For general information on how to get started, where to find the documentation
11-
and configuration see the README file in the kivy directory about Kivy.
12-
13-
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
14-
15-
16-
Running portable Kivy
17-
=====================
18-
19-
The same directory that has this README file in it, contains a file called kivy.bat
20-
running this kivy.bat file will set up the environment for kivy and starts the
21-
python interpreter with any arguments you passed
22-
23-
Example
24-
~~~~~~~
25-
26-
If you open a command line and go to the directory (or add it to your PATH)
27-
You can run the following:
28-
29-
kivy test.py -w <-- will run test.py as a python script with kivy ready to use
30-
31-
32-
Run a Kivy application without going to the command line
33-
========================================================
34-
35-
Two options :
36-
37-
1. You can drag your python script on top the kivy.bat file and it will launch
38-
39-
2. If you right click on your python script (.py ending or whatever you named it),
40-
you can select properties and select an application to open this type of file with.
41-
Navigate to the folder that includes this README and select the kivy.bat file.
42-
Now all you have to do is double click (check do this always for this file type
43-
to make this the default)
44-
45-
46-
If you already have Python installed
47-
====================================
48-
49-
The portable Kivy version shouldn't cause any conflicts and cooperate fairly well
50-
(at least if it's Python 2.6, otherwise some modules might cause problems if there
51-
is entries on PYTHONPATH)
52-
53-
54-
Install Kivy as a standard python module
55-
========================================
56-
57-
Please refer to the install instructions in the complete README :
58-
* Inside the kivy folder inside this one
59-
* Kivy documentation at http://kivy.org/docs/
60-
61-
62-
Install development environment inside your current shell
63-
=========================================================
64-
65-
If you want to develop with Kivy's python, you may just want to load the
66-
environment, and stay in your console. Inside a git bash / mingsys console, you
67-
can type :
68-
69-
source /path/to/kivyenv.sh
70-
71-
And it will load the whole enviroment of Kivy. This will give you an access to:
72-
73-
* Python binaries (python, pythonw, easy_install)
74-
* Cython binaries (cython)
75-
* Gstreamer binaries (gst-inspect, gst-launch, ...)
76-
* Pre-configured PYTHONPATH for gst and Kivy
77-
78-
Please note that if you already have a Python installed on your system, it will be
79-
not used.
1+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
2+
READ THIS FIRST
3+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4+
5+
This version of Kivy is a portable win32 version, 32 bits. (it work also for
6+
64 bits Windows.) This means everything you need to run kivy (including
7+
python and all other dependencies etc) are included.
8+
9+
This README only addresses the things specific to the portable version of kivy.
10+
For general information on how to get started, where to find the documentation
11+
and configuration see the README file in the kivy directory about Kivy.
12+
13+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
14+
15+
16+
Running portable Kivy
17+
=====================
18+
19+
The same directory that has this README file in it, contains a file called kivy.bat
20+
running this kivy.bat file will set up the environment for kivy and starts the
21+
python interpreter with any arguments you passed
22+
23+
Example
24+
~~~~~~~
25+
26+
If you open a command line and go to the directory (or add it to your PATH)
27+
You can run the following:
28+
29+
kivy test.py -w <-- will run test.py as a python script with kivy ready to use
30+
31+
32+
Run a Kivy application without going to the command line
33+
========================================================
34+
35+
Two options :
36+
37+
1. You can drag your python script on top the kivy.bat file and it will launch
38+
39+
2. If you right click on your python script (.py ending or whatever you named it),
40+
you can select properties and select an application to open this type of file with.
41+
Navigate to the folder that includes this README and select the kivy.bat file.
42+
Now all you have to do is double click (check do this always for this file type
43+
to make this the default)
44+
45+
46+
If you already have Python installed
47+
====================================
48+
49+
The portable Kivy version shouldn't cause any conflicts and cooperate fairly well
50+
(at least if it's Python 2.6, otherwise some modules might cause problems if there
51+
is entries on PYTHONPATH)
52+
53+
54+
Install Kivy as a standard python module
55+
========================================
56+
57+
Please refer to the install instructions in the complete README :
58+
* Inside the kivy folder inside this one
59+
* Kivy documentation at http://kivy.org/docs/
60+
61+
62+
Install development environment inside your current shell
63+
=========================================================
64+
65+
If you want to develop with Kivy's python, you may just want to load the
66+
environment, and stay in your console. Inside a git bash / mingsys console, you
67+
can type :
68+
69+
source /path/to/kivyenv.sh
70+
71+
And it will load the whole enviroment of Kivy. This will give you an access to:
72+
73+
* Python binaries (python, pythonw, easy_install)
74+
* Cython binaries (cython)
75+
* Gstreamer binaries (gst-inspect, gst-launch, ...)
76+
* Pre-configured PYTHONPATH for gst and Kivy
77+
78+
Please note that if you already have a Python installed on your system, it will be
79+
not used.

‎kivy/tools/packaging/win32/kivy.bat

+52-52
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
@ECHO off
2-
3-
set kivy_portable_root=%~dp0
4-
ECHO botstrapping Kivy @ %kivy_portable_root%
5-
6-
7-
IF DEFINED kivy_paths_initialized (GOTO :runkivy)
8-
9-
ECHO Setting Environment Variables:
10-
ECHO #################################
11-
12-
set GST_REGISTRY=%kivy_portable_root%gstreamer\registry.bin
13-
ECHO GST_REGISTRY
14-
ECHO %GST_REGISTRY%
15-
ECHO ---------------
16-
17-
set GST_PLUGIN_PATH=%kivy_portable_root%gstreamer\lib\gstreamer-0.10
18-
ECHO GST_PLUGIN_PATH:
19-
ECHO %GST_PLUGIN_PATH%
20-
ECHO ---------------
21-
22-
set PATH=%kivy_portable_root%;%kivy_portable_root%Python;%kivy_portable_root%Python\Scripts;%kivy_portable_root%gstreamer\bin;%kivy_portable_root%MinGW\bin;%PATH%
23-
ECHO PATH:
24-
ECHO %PATH%
25-
ECHO ----------------------------------
26-
27-
set PYTHONPATH=%kivy_portable_root%kivy;%PYTHONPATH%
28-
ECHO PYTHONPATH:
29-
ECHO %PYTHONPATH%
30-
ECHO ----------------------------------
31-
32-
SET kivy_paths_initialized=1
33-
ECHO ##################################
34-
35-
36-
:runkivy
37-
38-
ECHO done bootstraping kivy...have fun!\n
39-
IF (%1)==() GOTO SHELL
40-
ECHO running "python.exe %*" \n
41-
python.exe %*
42-
IF %errorlevel% NEQ 0 (PAUSE)
43-
GOTO END
44-
:SHELL
45-
ECHO.
46-
ECHO -----------------------------------------------------------------------
47-
ECHO - Running a shell, you can browse kivyexamples and launch apps with: -
48-
ECHO - python app.py -
49-
ECHO -----------------------------------------------------------------------
50-
ECHO.
51-
cmd
52-
:END
1+
@ECHO off
2+
3+
set kivy_portable_root=%~dp0
4+
ECHO botstrapping Kivy @ %kivy_portable_root%
5+
6+
7+
IF DEFINED kivy_paths_initialized (GOTO :runkivy)
8+
9+
ECHO Setting Environment Variables:
10+
ECHO #################################
11+
12+
set GST_REGISTRY=%kivy_portable_root%gstreamer\registry.bin
13+
ECHO GST_REGISTRY
14+
ECHO %GST_REGISTRY%
15+
ECHO ---------------
16+
17+
set GST_PLUGIN_PATH=%kivy_portable_root%gstreamer\lib\gstreamer-0.10
18+
ECHO GST_PLUGIN_PATH:
19+
ECHO %GST_PLUGIN_PATH%
20+
ECHO ---------------
21+
22+
set PATH=%kivy_portable_root%;%kivy_portable_root%Python;%kivy_portable_root%Python\Scripts;%kivy_portable_root%gstreamer\bin;%kivy_portable_root%MinGW\bin;%PATH%
23+
ECHO PATH:
24+
ECHO %PATH%
25+
ECHO ----------------------------------
26+
27+
set PYTHONPATH=%kivy_portable_root%kivy;%PYTHONPATH%
28+
ECHO PYTHONPATH:
29+
ECHO %PYTHONPATH%
30+
ECHO ----------------------------------
31+
32+
SET kivy_paths_initialized=1
33+
ECHO ##################################
34+
35+
36+
:runkivy
37+
38+
ECHO done bootstraping kivy...have fun!\n
39+
IF (%1)==() GOTO SHELL
40+
ECHO running "python.exe %*" \n
41+
python.exe %*
42+
IF %errorlevel% NEQ 0 (PAUSE)
43+
GOTO END
44+
:SHELL
45+
ECHO.
46+
ECHO -----------------------------------------------------------------------
47+
ECHO - Running a shell, you can browse kivyexamples and launch apps with: -
48+
ECHO - python app.py -
49+
ECHO -----------------------------------------------------------------------
50+
ECHO.
51+
cmd
52+
:END

0 commit comments

Comments
 (0)