Skip to content

Commit bf4adf1

Browse files
authored
Merge pull request #17 from trinitronx/project-packaging-updates
Project packaging updates - Prep for GitHub Arctic Code Vault 02/02/2020
2 parents fed9aa6 + a3e69dc commit bf4adf1

File tree

3 files changed

+41
-3
lines changed

3 files changed

+41
-3
lines changed

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,9 @@
22
.idea/misc.xml
33
*.xml
44
*.iml
5+
dist/
6+
build/lib
7+
build/scripts-*
8+
build/bdist.*
9+
vncpasswd.py.egg-info/
10+
MANIFEST

Makefile

+12-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ include ./build/main.mk
88

99
setup: ## Run python setup.py sdist
1010
python setup.py sdist
11+
sdist: setup
12+
13+
bdist: ## Run python setup.py bdist
14+
python setup.py bdist
15+
16+
bdist_rpm: ## Run python setup.py bdist_rpm
17+
python setup.py bdist_rpm
18+
19+
bdist_wininst: ## Run python setup.py bdist_wininst
20+
python setup.py bdist_wininst
1121

1222
install: ## Runs python setup.py install
1323
python setup.py install
@@ -17,7 +27,8 @@ test: ## Runs tests
1727

1828
.PHONY: clean
1929
clean:: ## Removes all temporary files - Executes make clean
20-
rm -rf ./dist
30+
rm -rf ./build/lib ./build/scripts-* ./build/bdist.*
31+
rm -rf ./dist ./vncpasswd.py.egg-info/
2132
rm -f MANIFEST
2233
rm -f README.rst README.txt
2334
find ./ -iname '*.pyc' -exec rm -f '{}' \;

setup.py

+23-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from distutils.core import setup
1+
from setuptools import setup, find_packages
22
import inspect
33
import os, errno
44

@@ -39,10 +39,31 @@
3939
name='vncpasswd.py',
4040
version=version,
4141
packages=['d3des','WindowsRegistry',],
42+
scripts=['vncpasswd.py', 'pass2reg.cmd'],
4243
license='License :: OSI Approved :: MIT License',
44+
description='A Python implementation of vncpasswd, w/decryption abilities & extra features ;-)',
4345
long_description=readme,
46+
platforms=['any'],
4447
author='James Cuzella',
4548
author_email='[email protected]',
46-
url='https://github.com/trinitronx/vncpasswd.py'
49+
url='https://github.com/trinitronx/vncpasswd.py',
50+
classifiers=[
51+
"Programming Language :: Python :: 2 :: Only",
52+
"Programming Language :: Python :: 2.7",
53+
"Programming Language :: Python :: Implementation :: CPython",
54+
"License :: OSI Approved :: MIT License",
55+
"Operating System :: OS Independent",
56+
"Natural Language :: English",
57+
"Operating System :: MacOS",
58+
"Operating System :: Microsoft :: Windows",
59+
"Operating System :: POSIX",
60+
"Operating System :: Unix",
61+
"Topic :: Security :: Cryptography",
62+
"Topic :: Software Development :: Libraries :: Python Modules",
63+
"Topic :: System :: Recovery Tools",
64+
"Topic :: System :: Systems Administration",
65+
"Topic :: Utilities"
66+
],
67+
python_requires='<=2.7'
4768
)
4869

0 commit comments

Comments
 (0)