From 4c3d5a4cdd7ad7aae8d331841b67504c45e04d62 Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Mon, 7 May 2012 15:20:16 +0800 Subject: Edit package_dir in setup.py so works --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 64dcdeb50..122d7fd3e 100755 --- a/setup.py +++ b/setup.py @@ -142,7 +142,7 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Snapshots", ], install_requires=inst_reqs, - package_dir={'Bcfg2': 'src/lib/Bcfg2'}, + package_dir={'Bcfg2': 'bcfg2/src/lib/Bcfg2',}, package_data={'Bcfg2.Server.Reports.reports': ['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', -- cgit v1.2.3-1-g7c22 From 81ad372d8b8adaa002bab773123bb6e5053adc85 Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Mon, 7 May 2012 15:34:35 +0800 Subject: Revert back to the original src/lib/Bcfg2 path --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 122d7fd3e..d7b3bf4cd 100755 --- a/setup.py +++ b/setup.py @@ -142,7 +142,7 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Snapshots", ], install_requires=inst_reqs, - package_dir={'Bcfg2': 'bcfg2/src/lib/Bcfg2',}, + package_dir={'Bcfg2': 'src/lib/Bcfg2',}, package_data={'Bcfg2.Server.Reports.reports': ['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', -- cgit v1.2.3-1-g7c22 From c4bef72d557c5a184db8f9470f4713d20df74ce3 Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Mon, 7 May 2012 15:39:11 +0800 Subject: Trying my luck with package_dir --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d7b3bf4cd..ead9f925e 100755 --- a/setup.py +++ b/setup.py @@ -142,7 +142,7 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Snapshots", ], install_requires=inst_reqs, - package_dir={'Bcfg2': 'src/lib/Bcfg2',}, + package_dir={'Bcfg2': 'src/bcfg2/src/lib/Bcfg2',}, package_data={'Bcfg2.Server.Reports.reports': ['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', -- cgit v1.2.3-1-g7c22 From acdc2da21594aa2678e893c22d8193ccefa8f9a1 Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Mon, 7 May 2012 15:40:24 +0800 Subject: what if we remove package_dir? --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ead9f925e..7d0cf87bb 100755 --- a/setup.py +++ b/setup.py @@ -142,7 +142,6 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Snapshots", ], install_requires=inst_reqs, - package_dir={'Bcfg2': 'src/bcfg2/src/lib/Bcfg2',}, package_data={'Bcfg2.Server.Reports.reports': ['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', -- cgit v1.2.3-1-g7c22 From 3db1081af2c1e4ea005ce0959e2c33eb3feee19e Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Mon, 7 May 2012 15:41:33 +0800 Subject: revert --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7d0cf87bb..d7b3bf4cd 100755 --- a/setup.py +++ b/setup.py @@ -142,6 +142,7 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Snapshots", ], install_requires=inst_reqs, + package_dir={'Bcfg2': 'src/lib/Bcfg2',}, package_data={'Bcfg2.Server.Reports.reports': ['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', -- cgit v1.2.3-1-g7c22 From 5f329434de005bff220d15824a6afa74084bb120 Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Mon, 7 May 2012 15:47:26 +0800 Subject: Try modifying package_dir again --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d7b3bf4cd..3e6787107 100755 --- a/setup.py +++ b/setup.py @@ -142,7 +142,7 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Snapshots", ], install_requires=inst_reqs, - package_dir={'Bcfg2': 'src/lib/Bcfg2',}, + package_dir={'': 'src/lib/Bcfg2',}, package_data={'Bcfg2.Server.Reports.reports': ['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', -- cgit v1.2.3-1-g7c22 From 2752bddb3a880735d764df9e1f833e1effce84dc Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Mon, 7 May 2012 15:48:10 +0800 Subject: Try modifying package_dir again --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3e6787107..69b6515ad 100755 --- a/setup.py +++ b/setup.py @@ -142,7 +142,7 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Snapshots", ], install_requires=inst_reqs, - package_dir={'': 'src/lib/Bcfg2',}, + package_dir={'': 'src/lib',}, package_data={'Bcfg2.Server.Reports.reports': ['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', -- cgit v1.2.3-1-g7c22